| 1 |
commit: 8ef3acb1303d8770f7545f21b7d0c2f49fbb09a1 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 12 08:59:45 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 12 08:59:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef3acb1 |
| 7 |
|
| 8 |
www-servers/tomcat: restricted tomcat-servlet-api versions |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/tomcat/tomcat-7.0.96.ebuild | 4 ++-- |
| 14 |
www-servers/tomcat/tomcat-7.0.99.ebuild | 2 +- |
| 15 |
www-servers/tomcat/tomcat-8.5.47.ebuild | 4 ++-- |
| 16 |
www-servers/tomcat/tomcat-9.0.27.ebuild | 4 ++-- |
| 17 |
4 files changed, 7 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.96.ebuild |
| 20 |
index 443dd981a8d..ad19069fd89 100644 |
| 21 |
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild |
| 22 |
+++ b/www-servers/tomcat/tomcat-7.0.96.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5" |
| 30 |
SAPI_SLOT="3.0" |
| 31 |
|
| 32 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 33 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
| 34 |
+ ~dev-java/tomcat-servlet-api-${PV}" |
| 35 |
RDEPEND="${COMMON_DEP} |
| 36 |
virtual/jre" |
| 37 |
DEPEND="${COMMON_DEP} |
| 38 |
|
| 39 |
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild |
| 40 |
index 7fa74915d25..4df8f1204b9 100644 |
| 41 |
--- a/www-servers/tomcat/tomcat-7.0.99.ebuild |
| 42 |
+++ b/www-servers/tomcat/tomcat-7.0.99.ebuild |
| 43 |
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5" |
| 44 |
SAPI_SLOT="3.0" |
| 45 |
|
| 46 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 47 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT}" |
| 48 |
+ ~dev-java/tomcat-servlet-api-${PV}" |
| 49 |
RDEPEND="${COMMON_DEP} |
| 50 |
virtual/jre" |
| 51 |
DEPEND="${COMMON_DEP} |
| 52 |
|
| 53 |
diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.47.ebuild |
| 54 |
index d34cd3a9d3c..729cd12dcdf 100644 |
| 55 |
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild |
| 56 |
+++ b/www-servers/tomcat/tomcat-8.5.47.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2019 Gentoo Authors |
| 59 |
+# Copyright 1999-2020 Gentoo Authors |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=7 |
| 63 |
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5" |
| 64 |
SAPI_SLOT="3.1" |
| 65 |
|
| 66 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 67 |
- >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
| 68 |
+ ~dev-java/tomcat-servlet-api-${PV}" |
| 69 |
RDEPEND="${COMMON_DEP} |
| 70 |
>=virtual/jre-1.8" |
| 71 |
DEPEND="${COMMON_DEP} |
| 72 |
|
| 73 |
diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild |
| 74 |
index 182cad35d13..b8e080bf0d7 100644 |
| 75 |
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild |
| 76 |
+++ b/www-servers/tomcat/tomcat-9.0.27.ebuild |
| 77 |
@@ -1,4 +1,4 @@ |
| 78 |
-# Copyright 1999-2019 Gentoo Authors |
| 79 |
+# Copyright 1999-2020 Gentoo Authors |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
EAPI=7 |
| 83 |
@@ -33,7 +33,7 @@ SAPI_SLOT="4.0" |
| 84 |
|
| 85 |
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
| 86 |
dev-java/glassfish-xmlrpc-api:0 |
| 87 |
- dev-java/tomcat-servlet-api:${SAPI_SLOT} |
| 88 |
+ ~dev-java/tomcat-servlet-api-${PV} |
| 89 |
dev-java/wsdl4j:0" |
| 90 |
RDEPEND="${COMMON_DEP} |
| 91 |
>=virtual/jre-11" |
Archives