From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B91F1382C5 for ; Sun, 8 Apr 2018 20:15:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F712E0A5A; Sun, 8 Apr 2018 20:15:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 681BDE0A5A for ; Sun, 8 Apr 2018 20:15:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D634E335C49 for ; Sun, 8 Apr 2018 20:15:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A31F3276 for ; Sun, 8 Apr 2018 20:15:08 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1523218500.89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch www-servers/tomcat/tomcat-7.0.84.ebuild www-servers/tomcat/tomcat-7.0.85.ebuild www-servers/tomcat/tomcat-8.0.49.ebuild www-servers/tomcat/tomcat-8.0.50.ebuild www-servers/tomcat/tomcat-8.5.27.ebuild www-servers/tomcat/tomcat-8.5.28.ebuild www-servers/tomcat/tomcat-9.0.4.ebuild www-servers/tomcat/tomcat-9.0.5.ebuild X-VCS-Directories: www-servers/tomcat/files/ www-servers/tomcat/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf X-VCS-Branch: master Date: Sun, 8 Apr 2018 20:15:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d70f711e-16f9-4d72-b8d8-6f5b5137773d X-Archives-Hash: 547e31ef91d26036716f9b321e7572f9 commit: 89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf Author: Marty E. Plummer startmail com> AuthorDate: Sun Apr 8 19:12:30 2018 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Apr 8 20:15:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89207d13 www-servers/tomcat: clean duplicate patches Also cleaned up the patches to be -p1 applicable where doable for the eventual epatch->eapply change. Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7888 .../tomcat/files/tomcat-7.0.82-build.xml.patch | 5 +- .../tomcat/files/tomcat-7.0.84-build.xml.patch | 2 - .../tomcat/files/tomcat-7.0.85-build.xml.patch | 161 ------------- .../tomcat/files/tomcat-8.0.48-build.xml.patch | 6 +- .../tomcat/files/tomcat-8.0.49-build.xml.patch | 2 - .../tomcat/files/tomcat-8.0.50-build.xml.patch | 267 --------------------- .../tomcat/files/tomcat-8.5.24-build.xml.patch | 6 +- .../tomcat/files/tomcat-8.5.27-build.xml.patch | 2 - .../tomcat/files/tomcat-8.5.28-build.xml.patch | 258 -------------------- .../tomcat/files/tomcat-9.0.4-build.xml.patch | 2 - .../tomcat/files/tomcat-9.0.5-build.xml.patch | 258 -------------------- www-servers/tomcat/tomcat-7.0.84.ebuild | 2 +- www-servers/tomcat/tomcat-7.0.85.ebuild | 2 +- www-servers/tomcat/tomcat-8.0.49.ebuild | 2 +- www-servers/tomcat/tomcat-8.0.50.ebuild | 2 +- www-servers/tomcat/tomcat-8.5.27.ebuild | 2 +- www-servers/tomcat/tomcat-8.5.28.ebuild | 2 +- www-servers/tomcat/tomcat-9.0.4.ebuild | 2 +- www-servers/tomcat/tomcat-9.0.5.ebuild | 2 +- 19 files changed, 14 insertions(+), 971 deletions(-) diff --git a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch index 481591fb6ff..fa05cb73305 100644 --- a/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-7.0.82-build.xml.patch @@ -1,6 +1,5 @@ -diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml ---- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 -+++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 +--- a/build.xml ++++ b/build.xml @@ -660,12 +660,14 @@ diff --git a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch index aa40bd1564a..743320010c9 100644 --- a/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-7.0.84-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index 3f1229c..13894ed 100644 --- a/build.xml +++ b/build.xml @@ -671,12 +671,14 @@ diff --git a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch deleted file mode 100644 index aa40bd1564a..00000000000 --- a/www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff --git a/build.xml b/build.xml -index 3f1229c..13894ed 100644 ---- a/build.xml -+++ b/build.xml -@@ -671,12 +671,14 @@ - - - -+ - - - -@@ -733,26 +735,32 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - - -+ - - -+ - - - -- -+ - - - -@@ -1060,14 +1068,15 @@ - - - -+ - - -- -+ - - - -+ description="Prepare to build web services extras package" unless="noget"> - - - -@@ -1886,11 +1895,12 @@ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - description="Create the Tomcat javadoc" > - -+ - - - -+ - - - -@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - - -+ description="Download additional components for a distribution" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch index b0862aef305..7cb4e1ed527 100644 --- a/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch @@ -1,7 +1,5 @@ -diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml -index 6b4465a..ab4008d 100644 ---- a/apache-tomcat-8.0.47-src/build.xml -+++ b/apache-tomcat-8.0.47-src/build.xml +--- a/build.xml ++++ b/build.xml @@ -715,24 +715,29 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch index b7e0a283fe2..ab6590d5c12 100644 --- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index 3152712..9e09384 100644 --- a/build.xml +++ b/build.xml @@ -718,24 +718,29 @@ diff --git a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch deleted file mode 100644 index b7e0a283fe2..00000000000 --- a/www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff --git a/build.xml b/build.xml -index 3152712..9e09384 100644 ---- a/build.xml -+++ b/build.xml -@@ -718,24 +718,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - - -+ - - - -- -+ - - - -@@ -1067,7 +1072,7 @@ - - - -- -+ - - - -@@ -1101,7 +1106,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - -+ - - - -+ - - - -@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch index d83440c0c4d..9db6d404674 100644 --- a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch @@ -1,7 +1,5 @@ -diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml -index b1b2666..263800c 100644 ---- a/apache-tomcat-8.5.23-src/build.xml -+++ b/apache-tomcat-8.5.23-src/build.xml +--- a/build.xml ++++ b/build.xml @@ -714,24 +714,29 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch index e08dd17c6cc..c8022bcd5e4 100644 --- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index 2b3c7cf..b8e57e0 100644 --- a/build.xml +++ b/build.xml @@ -717,24 +717,29 @@ diff --git a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch deleted file mode 100644 index e08dd17c6cc..00000000000 --- a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff --git a/build.xml b/build.xml -index 2b3c7cf..b8e57e0 100644 ---- a/build.xml -+++ b/build.xml -@@ -717,24 +717,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - - -+ - - - -- -+ - - - -@@ -1072,7 +1077,7 @@ - - - -- -+ - - - -@@ -1106,7 +1111,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - -+ - - - -+ - - - -@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch index 87f869dd4c0..feb5f126a37 100644 --- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index c1331c9..b664cc3 100644 --- a/build.xml +++ b/build.xml @@ -719,24 +719,30 @@ diff --git a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch deleted file mode 100644 index 87f869dd4c0..00000000000 --- a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff --git a/build.xml b/build.xml -index c1331c9..b664cc3 100644 ---- a/build.xml -+++ b/build.xml -@@ -719,24 +719,30 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - - -+ - - -+ - - - -- -+ - - - -@@ -1074,7 +1080,7 @@ - - - -- -+ - - - -@@ -1108,7 +1114,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - -+ - - - -+ - - - -@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/tomcat-7.0.84.ebuild b/www-servers/tomcat/tomcat-7.0.84.ebuild index bebf2f0f814..7917995deab 100644 --- a/www-servers/tomcat/tomcat-7.0.84.ebuild +++ b/www-servers/tomcat/tomcat-7.0.84.ebuild @@ -48,7 +48,7 @@ src_prepare() { java-pkg_clean - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild b/www-servers/tomcat/tomcat-7.0.85.ebuild index bebf2f0f814..7917995deab 100644 --- a/www-servers/tomcat/tomcat-7.0.85.ebuild +++ b/www-servers/tomcat/tomcat-7.0.85.ebuild @@ -48,7 +48,7 @@ src_prepare() { java-pkg_clean - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-7.0.84-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-8.0.49.ebuild b/www-servers/tomcat/tomcat-8.0.49.ebuild index 5f9b5faf780..d75c0ef779c 100644 --- a/www-servers/tomcat/tomcat-8.0.49.ebuild +++ b/www-servers/tomcat/tomcat-8.0.49.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild b/www-servers/tomcat/tomcat-8.0.50.ebuild index 5f9b5faf780..d75c0ef779c 100644 --- a/www-servers/tomcat/tomcat-8.0.50.ebuild +++ b/www-servers/tomcat/tomcat-8.0.50.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-8.0.49-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild b/www-servers/tomcat/tomcat-8.5.27.ebuild index 889da8d4f23..0fb74bf75f0 100644 --- a/www-servers/tomcat/tomcat-8.5.27.ebuild +++ b/www-servers/tomcat/tomcat-8.5.27.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild index 889da8d4f23..0fb74bf75f0 100644 --- a/www-servers/tomcat/tomcat-8.5.28.ebuild +++ b/www-servers/tomcat/tomcat-8.5.28.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild index 9b79ebaf947..36b0d091699 100644 --- a/www-servers/tomcat/tomcat-9.0.4.ebuild +++ b/www-servers/tomcat/tomcat-9.0.4.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild index 9b79ebaf947..36b0d091699 100644 --- a/www-servers/tomcat/tomcat-9.0.5.ebuild +++ b/www-servers/tomcat/tomcat-9.0.5.ebuild @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - epatch "${FILESDIR}/${P}-build.xml.patch" + epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\