commit: 39affe454268f966439784c9d123186af19bb0f5
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Apr 10 23:29:49 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 21:04:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39affe45
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
www-servers/tomcat/tomcat-7.0.82.ebuild | 2 +-
www-servers/tomcat/tomcat-7.0.84.ebuild | 2 +-
www-servers/tomcat/tomcat-7.0.85.ebuild | 2 +-
www-servers/tomcat/tomcat-8.0.48.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.28.ebuild | 2 +-
www-servers/tomcat/tomcat-8.5.30.ebuild | 2 +-
www-servers/tomcat/tomcat-9.0.5.ebuild | 2 +-
www-servers/tomcat/tomcat-9.0.7.ebuild | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/www-servers/tomcat/tomcat-7.0.82.ebuild
b/www-servers/tomcat/tomcat-7.0.82.ebuild
index 6e42aeda702..68d853eb85a 100644
--- 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 7917995deab..8ed5c13fa74 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}/${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 7917995deab..8ed5c13fa74 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}/${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 f48bfc74c0a..990c2f21d48 100644
--- 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 d75c0ef779c..46de488be6f 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}/${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 d75c0ef779c..46de488be6f 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}/${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 5e09cb9bab2..52f5424f793 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}/${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 0fb74bf75f0..00cb33f8cfc 100644
--- 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 b07ff55c989..e3c61d5f22c 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}/${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 36b0d091699..9cf24df3ac0 100644
--- 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\
