summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-04-08 14:12:30 -0500
committerJames Le Cuirot <chewi@gentoo.org>2018-04-08 21:15:00 +0100
commit89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf (patch)
treeecedc64712516baa66645562eb36fc1d60f8a0c6 /www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch
parentnet-firewall/pglinux: Drop obsolete DEPEND (diff)
downloadgentoo-89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf.tar.gz
gentoo-89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf.tar.bz2
gentoo-89207d1358e4fd2c23c25adbe4dc1d16d2bcffaf.zip
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
Diffstat (limited to 'www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch')
-rw-r--r--www-servers/tomcat/files/tomcat-8.0.48-build.xml.patch6
1 files changed, 2 insertions, 4 deletions
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 b0862aef305e..7cb4e1ed5278 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" />