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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 225EA138350 for ; Wed, 12 Feb 2020 09:00:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CBDAE0896; Wed, 12 Feb 2020 09:00:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 053EFE0896 for ; Wed, 12 Feb 2020 09:00:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F44934EC38 for ; Wed, 12 Feb 2020 09:00:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7ED1110B for ; Wed, 12 Feb 2020 09:00:08 +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: <1581497985.8ef3acb1303d8770f7545f21b7d0c2f49fbb09a1.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-7.0.96.ebuild www-servers/tomcat/tomcat-7.0.99.ebuild www-servers/tomcat/tomcat-8.5.47.ebuild www-servers/tomcat/tomcat-9.0.27.ebuild X-VCS-Directories: www-servers/tomcat/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 8ef3acb1303d8770f7545f21b7d0c2f49fbb09a1 X-VCS-Branch: master Date: Wed, 12 Feb 2020 09:00:08 +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: 25d5bcef-7c28-4a47-bdd3-ac54446b2db6 X-Archives-Hash: 91274ece56cde1f5ffd5559759a69a73 commit: 8ef3acb1303d8770f7545f21b7d0c2f49fbb09a1 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Feb 12 08:59:45 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Feb 12 08:59:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef3acb1 www-servers/tomcat: restricted tomcat-servlet-api versions Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/tomcat-7.0.96.ebuild | 4 ++-- www-servers/tomcat/tomcat-7.0.99.ebuild | 2 +- www-servers/tomcat/tomcat-8.5.47.ebuild | 4 ++-- www-servers/tomcat/tomcat-9.0.27.ebuild | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.96.ebuild index 443dd981a8d..ad19069fd89 100644 --- a/www-servers/tomcat/tomcat-7.0.96.ebuild +++ b/www-servers/tomcat/tomcat-7.0.96.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ ECJ_SLOT="4.5" SAPI_SLOT="3.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/tomcat-servlet-api:${SAPI_SLOT}" + ~dev-java/tomcat-servlet-api-${PV}" RDEPEND="${COMMON_DEP} virtual/jre" DEPEND="${COMMON_DEP} diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild index 7fa74915d25..4df8f1204b9 100644 --- a/www-servers/tomcat/tomcat-7.0.99.ebuild +++ b/www-servers/tomcat/tomcat-7.0.99.ebuild @@ -24,7 +24,7 @@ ECJ_SLOT="4.5" SAPI_SLOT="3.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/tomcat-servlet-api:${SAPI_SLOT}" + ~dev-java/tomcat-servlet-api-${PV}" RDEPEND="${COMMON_DEP} virtual/jre" DEPEND="${COMMON_DEP} diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.47.ebuild index d34cd3a9d3c..729cd12dcdf 100644 --- a/www-servers/tomcat/tomcat-8.5.47.ebuild +++ b/www-servers/tomcat/tomcat-8.5.47.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ ECJ_SLOT="4.5" SAPI_SLOT="3.1" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" + ~dev-java/tomcat-servlet-api-${PV}" RDEPEND="${COMMON_DEP} >=virtual/jre-1.8" DEPEND="${COMMON_DEP} diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild index 182cad35d13..b8e080bf0d7 100644 --- a/www-servers/tomcat/tomcat-9.0.27.ebuild +++ b/www-servers/tomcat/tomcat-9.0.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ SAPI_SLOT="4.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} dev-java/glassfish-xmlrpc-api:0 - dev-java/tomcat-servlet-api:${SAPI_SLOT} + ~dev-java/tomcat-servlet-api-${PV} dev-java/wsdl4j:0" RDEPEND="${COMMON_DEP} >=virtual/jre-11"