[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/

[Miroslav Šulc]

commit:     8ef3acb1303d8770f7545f21b7d0c2f49fbb09a1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 08:59:45 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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"