From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2C4F15802F for ; Sat, 4 Mar 2023 12:49:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF247E07B3; Sat, 4 Mar 2023 12:49:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0982E07B3 for ; Sat, 4 Mar 2023 12:49:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C673534136C for ; Sat, 4 Mar 2023 12:49:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E35973E for ; Sat, 4 Mar 2023 12:49:48 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1677933991.c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/tomcat-10.1.6.ebuild www-servers/tomcat/tomcat-8.5.87.ebuild www-servers/tomcat/tomcat-9.0.73.ebuild X-VCS-Directories: www-servers/tomcat/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8 X-VCS-Branch: master Date: Sat, 4 Mar 2023 12:49:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e575b08d-090d-42fb-9f3b-a20710ff0a13 X-Archives-Hash: 318722fd609a3369e6988041a4c6e14c commit: c48bc95b2a5cd32ca759441e564c8d23ddcf3ed8 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Feb 26 11:34:59 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Mar 4 12:46:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48bc95b www-servers/tomcat: move patches to PATCHES array Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29805 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/tomcat-10.1.6.ebuild | 4 ++-- www-servers/tomcat/tomcat-8.5.87.ebuild | 4 ++-- 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}\`" \