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 76B76158089 for ; Wed, 8 Nov 2023 09:02:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B162B2BC018; Wed, 8 Nov 2023 09:02:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A2612BC018 for ; Wed, 8 Nov 2023 09:02:22 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC67A335D27 for ; Wed, 8 Nov 2023 09:02:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 316CDAAC for ; Wed, 8 Nov 2023 09:02:20 +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: <1699433993.5e554b5f850115f621d25cc56261aacab235f3ef.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/files/tomcat-8.5.95-min.java.patch www-servers/tomcat/tomcat-8.5.95.ebuild X-VCS-Directories: www-servers/tomcat/ www-servers/tomcat/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 5e554b5f850115f621d25cc56261aacab235f3ef X-VCS-Branch: master Date: Wed, 8 Nov 2023 09:02:20 +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: 7d967d69-71cc-4ba0-8866-f3bc7923c206 X-Archives-Hash: 012d0a546dcdeffa4525f30e36508d01 commit: 5e554b5f850115f621d25cc56261aacab235f3ef Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Nov 3 07:31:12 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Nov 8 08:59:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e554b5f www-servers/tomcat: min java 1.8 (slot 8.5) Closes: https://bugs.gentoo.org/916705 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33643 Signed-off-by: Miroslav Šulc gentoo.org> .../tomcat/files/tomcat-8.5.95-min.java.patch | 37 ++++++++++++++++++++++ www-servers/tomcat/tomcat-8.5.95.ebuild | 5 ++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch new file mode 100644 index 000000000000..9198ff3a1911 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch @@ -0,0 +1,37 @@ +diff --git a/build.xml b/build.xml +index 723be26..3cf7bb7 100644 +--- a/build.xml ++++ b/build.xml +@@ -112,8 +112,8 @@ + + + +- +- ++ ++ + + + +--- a/webapps/docs/tomcat-docs.xsl ++++ b/webapps/docs/tomcat-docs.xsl +@@ -39,7 +39,7 @@ + + + +- ++ + + + +--- a/modules/jdbc-pool/build.properties.default ++++ b/modules/jdbc-pool/build.properties.default +@@ -40,7 +40,7 @@ version.suffix= + # contexts by the various build scripts. + base.path=${basedir}/includes + +-compile.release=7 ++compile.release=8 + compile.debug=true + + # Do not pass -deprecation (-Xlint:deprecation) flag to javac diff --git a/www-servers/tomcat/tomcat-8.5.95.ebuild b/www-servers/tomcat/tomcat-8.5.95.ebuild index d4b11f790044..7c3cee7e4014 100644 --- a/www-servers/tomcat/tomcat-8.5.95.ebuild +++ b/www-servers/tomcat/tomcat-8.5.95.ebuild @@ -47,7 +47,10 @@ DEPEND="${COMMON_DEP} BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" -PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-8.5.86-build.xml.patch" + "${FILESDIR}/${PN}-8.5.95-min.java.patch" +) S=${WORKDIR}/${MY_P}