diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-02-26 12:34:59 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-03-04 13:46:31 +0100 |
| commit | c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8 (patch) | |
| tree | a364eb6b0836efd1e46fac3a0fd55b1a29e2fcf5 /www-servers | |
| parent | www-servers/tomcat: bump to 8.5.87, dropped 8.5.86 (diff) | |
| download | gentoo-c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8.tar.gz gentoo-c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8.tar.bz2 gentoo-c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8.zip | |
www-servers/tomcat: move patches to PATCHES array
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29805
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/tomcat-10.1.6.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-8.5.87.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-9.0.73.ebuild | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.6.ebuild index 17af3cdb9074..a2d0614c3733 100644 --- a/www-servers/tomcat/tomcat-10.1.6.ebuild +++ b/www-servers/tomcat/tomcat-10.1.6.ebuild @@ -51,6 +51,8 @@ DEPEND="${COMMON_DEP} BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" +PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" ) + S=${WORKDIR}/${MY_P} BND_HOME="${S}/tomcat-build-libs/bnd" @@ -75,8 +77,6 @@ src_prepare() { find -name '*.jar' -type f -delete -print || die - eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch" - local vm_version="$(java-config -g PROVIDES_VERSION)" # For use of catalina.sh in netbeans diff --git a/www-servers/tomcat/tomcat-8.5.87.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild index e1506972d167..6f5f1a7f9687 100644 --- a/www-servers/tomcat/tomcat-8.5.87.ebuild +++ b/www-servers/tomcat/tomcat-8.5.87.ebuild @@ -47,6 +47,8 @@ DEPEND="${COMMON_DEP} BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" +PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" ) + S=${WORKDIR}/${MY_P} src_prepare() { @@ -54,8 +56,6 @@ src_prepare() { find -name '*.jar' -type f -delete -print || die - eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch" - # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ diff --git a/www-servers/tomcat/tomcat-9.0.73.ebuild b/www-servers/tomcat/tomcat-9.0.73.ebuild index 106615a65169..3a87d1e05600 100644 --- a/www-servers/tomcat/tomcat-9.0.73.ebuild +++ b/www-servers/tomcat/tomcat-9.0.73.ebuild @@ -57,6 +57,7 @@ S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" + "${FILESDIR}/${PN}-9.0.72-build.xml.patch" ) BND_HOME="${S}/tomcat-build-libs/bnd" @@ -81,8 +82,6 @@ src_prepare() { find -name '*.jar' -type f -delete -print || die - eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch" - # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ |