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>
This commit is contained in:
Volkmar W. Pogatzki
2023-03-04 13:46:31 +01:00
committed by Miroslav Šulc
parent 66fe89bea2
commit c48bc95b2a
3 changed files with 5 additions and 6 deletions
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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}\`" \
+1 -2
View File
@@ -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}\`" \