From 7f8334a0bc38f6062b31dd864121a53f27a5b24a Mon Sep 17 00:00:00 2001
From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Fri, 22 Nov 2019 11:52:48 +0100
Subject: www-servers/tomcat: fixed some qa issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) removed \!<dev-java/tomcat-native-1.1.24 restriction
   (not in the tree anymore)
2) fixed dependency on dev-java/tomcat-servlet-api
   in 9.0.7 to include revisions

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 www-servers/tomcat/tomcat-7.0.96.ebuild | 3 +--
 www-servers/tomcat/tomcat-8.5.46.ebuild | 1 -
 www-servers/tomcat/tomcat-8.5.47.ebuild | 1 -
 www-servers/tomcat/tomcat-9.0.27.ebuild | 1 -
 www-servers/tomcat/tomcat-9.0.7.ebuild  | 5 ++---
 5 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'www-servers/tomcat')

diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.96.ebuild
index cd40b029523a..443dd981a8d0 100644
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.96.ebuild
@@ -26,8 +26,7 @@ SAPI_SLOT="3.0"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	virtual/jre
-	!<dev-java/tomcat-native-1.1.24"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
 	virtual/jdk:1.8
 	test? ( dev-java/ant-junit:0 )"
diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild
index c6e5e958e89e..0437014fa017 100644
--- a/www-servers/tomcat/tomcat-8.5.46.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.46.ebuild
@@ -26,7 +26,6 @@ SAPI_SLOT="3.1"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.7"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.47.ebuild
index 9b5c64f0de13..d34cd3a9d3cb 100644
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.47.ebuild
@@ -26,7 +26,6 @@ SAPI_SLOT="3.1"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild
index 6f5e0ef52f6d..182cad35d13c 100644
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.27.ebuild
@@ -36,7 +36,6 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-11"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild
index 7a404767db95..967fffcd751e 100644
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,9 +24,8 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
-- 
cgit v1.2.3-65-gdbad