Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: java-virtuals/servlet-api/
Date: Fri, 07 Jan 2022 08:18:43
Message-Id: 1641543491.fd6cd15a4bb36b061d6a4132c2f0b21fab060b3b.fordfrog@gentoo
1 commit: fd6cd15a4bb36b061d6a4132c2f0b21fab060b3b
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Thu Jan 6 21:46:17 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 7 08:18:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6cd15a
7
8 java-virtuals/servlet-api: remove glassfish
9
10 dev-java/glassfish-servlet-api:2.5 was removed years ago
11 Bug: https://bugs.gentoo.org/830680
12 Package-Manager: Portage-3.0.28, Repoman-3.0.3
13 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
14 Closes: https://github.com/gentoo/gentoo/pull/23678
15 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17 java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild | 10 +++-------
18 1 file changed, 3 insertions(+), 7 deletions(-)
19
20 diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
21 index ba1c8aaae1e6..a78bc2b404ef 100644
22 --- a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
23 +++ b/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2022 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=6
30 @@ -13,10 +13,6 @@ LICENSE="public-domain"
31 SLOT="${PV}"
32 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
33
34 -RDEPEND="|| (
35 - dev-java/tomcat-servlet-api:${SLOT}
36 - dev-java/resin-servlet-api:${SLOT}
37 - dev-java/glassfish-servlet-api:${SLOT}
38 - )"
39 +RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
40
41 -JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT} glassfish-servlet-api-${SLOT}"
42 +JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"