Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/
Date: Sat, 31 Oct 2020 09:23:59
Message-Id: 1604136033.4fa7045d3516f76e5ce9995f9e9f6a6b069e3938.asturm@gentoo
1 commit: 4fa7045d3516f76e5ce9995f9e9f6a6b069e3938
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 17:18:10 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 09:20:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa7045d
7
8 profiles: Consolidate >=virtual/{jdk,jre}-11 related masks
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 profiles/package.mask | 18 ++++++------------
13 1 file changed, 6 insertions(+), 12 deletions(-)
14
15 diff --git a/profiles/package.mask b/profiles/package.mask
16 index 878677bf10d..07cd7587b1b 100644
17 --- a/profiles/package.mask
18 +++ b/profiles/package.mask
19 @@ -387,8 +387,12 @@ net-libs/nDPI
20 =mail-mta/postfix-3.6*
21
22 # Miroslav Šulc <fordfrog@g.o> (2020-02-27)
23 -# Depends on dev-java/eclipse-ecj:4.13 which
24 -# depends on >=virtual/{jdk,jre}-11 which is masked
25 +# dev-java/ant-eclipse-ecj:4.10 depends on masked >=virtual/{jdk,jre}-11
26 +# www-servers/tomcat:9 depends on masked dev-java/eclipse-ecj:4.13
27 +dev-java/ant-eclipse-ecj:4.13
28 +dev-java/eclipse-ecj:4.13
29 +dev-java/ant-eclipse-ecj:4.10
30 +dev-java/eclipse-ecj:4.10
31 www-servers/tomcat:9
32
33 # Mart Raudsepp <leio@g.o> (2020-02-16)
34 @@ -427,11 +431,6 @@ net-misc/gnome-remote-desktop
35 # Depends on apache-2.2
36 dev-libs/OpenSRF
37
38 -# Miroslav Šulc <fordfrog@g.o> (2019-10-16)
39 -# Depends on >=virtual/{jdk,jre}-11 which is masked
40 -dev-java/ant-eclipse-ecj:4.13
41 -dev-java/eclipse-ecj:4.13
42 -
43 # Matt Turner <mattst88@g.o> (2019-09-01)
44 # TeXmacs is the only remaining package in tree that requires guile-1.8, which
45 # is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
46 @@ -452,11 +451,6 @@ app-office/texmacs
47 # Requires >=dev-lang/lua-5.3 which is masked
48 sys-apps/likwid
49
50 -# Miroslav Šulc <fordfrog@g.o> (2019-01-23)
51 -# Depends on >=virtual/{jdk,jre}-11 which is masked
52 -dev-java/ant-eclipse-ecj:4.10
53 -dev-java/eclipse-ecj:4.10
54 -
55 # Thomas Deutschmann <whissi@g.o> (2018-12-10)
56 # Requires >=dev-lang/lua-5.2 which is masked
57 >=app-admin/lsyncd-2.2.3