www-servers/tomcat: eapply->epatch.

Also converted the rest of the ${P}'s to ${PN}-${PV} to hopefully
prevent more of the massive patch duplication we saw earlier.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

diff --git a/www-servers/tomcat/tomcat-7.0.82.ebuild b/www-servers/tomcat/tomcat-7.0.82.ebuild
index 6e42aeda702e53d9298a9f060897732484241204..68d853eb85a957418e2d0f643539dacab6bedb1e 100644 (file)
--- a/www-servers/tomcat/tomcat-7.0.82.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.82.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 
        java-pkg_clean
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       eapply "${FILESDIR}/${PN}-7.0.82-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.84.ebuild b/www-servers/tomcat/tomcat-7.0.84.ebuild
index 7917995deab00babdeee0014ffc0d8438b2b84d6..8ed5c13fa74817032cdc334e2462b30f3315829d 100644 (file)
--- 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}/${PN}-7.0.84-build.xml.patch"
+       eapply "${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 7917995deab00babdeee0014ffc0d8438b2b84d6..8ed5c13fa74817032cdc334e2462b30f3315829d 100644 (file)
--- 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}/${PN}-7.0.84-build.xml.patch"
+       eapply "${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.48.ebuild b/www-servers/tomcat/tomcat-8.0.48.ebuild
index f48bfc74c0ac0fc3a44947e9734d724692dcc8b3..990c2f21d48dab274c4d309e2e35ceaa160098d7 100644 (file)
--- a/www-servers/tomcat/tomcat-8.0.48.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.48.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${P}-build.xml.patch"
+       eapply "${FILESDIR}/${PN}-8.0.48-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 d75c0ef779c8db08142e56961ae9a230335408cb..46de488be6f4086220e4b00ca90cea2f4c538a57 100644 (file)
--- 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}/${PN}-8.0.49-build.xml.patch"
+       eapply "${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 d75c0ef779c8db08142e56961ae9a230335408cb..46de488be6f4086220e4b00ca90cea2f4c538a57 100644 (file)
--- 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}/${PN}-8.0.49-build.xml.patch"
+       eapply "${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.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild
index 5e09cb9bab2f14bedbfb2a88348ca0eb0de5935a..52f5424f7934b6826c47178130101b02abe85a6e 100644 (file)
--- 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}/${PN}-8.5.27-build.xml.patch"
+       eapply "${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.30.ebuild b/www-servers/tomcat/tomcat-8.5.30.ebuild
index 0fb74bf75f017591a2a020c2fff4b3f93b64cabe..00cb33f8cfc07d36e6b8072b87e80510079fae84 100644 (file)
--- a/www-servers/tomcat/tomcat-8.5.30.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.30.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
+       eapply "${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.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild
index b07ff55c989fe9f0ee4cbfb325c7d9a724018d74..e3c61d5f22c2ee8248d7b0b17f8140e3dc6e909c 100644 (file)
--- 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}/${PN}-9.0.4-build.xml.patch"
+       eapply "${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.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild
index 36b0d0916999a9ad4d0455a300e85a24c7778b1e..9cf24df3ac0213cd1de17a77c9e5b06d3a1921a3 100644 (file)
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.7.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # Remove bundled servlet-api
        rm -rv java/javax/{el,servlet} || die
 
-       epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
+       eapply "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
 
        # For use of catalina.sh in netbeans
        sed -i -e "/^# ----- Execute The Requested Command/ a\