summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-10-31 09:35:14 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-10-31 09:35:14 +0000
commitd9a2c8dcad2a26d84a07d007dc08f35c5548a32d (patch)
treed9e430250fb03c8f0c0f44f660ab6e2a9ef52a30 /profiles
parent2020-10-31 09:05:26 UTC (diff)
parentprofiles: Consolidate >=virtual/{jdk,jre}-11 related masks (diff)
downloadgentoo-d9a2c8dcad2a26d84a07d007dc08f35c5548a32d.tar.gz
gentoo-d9a2c8dcad2a26d84a07d007dc08f35c5548a32d.tar.bz2
gentoo-d9a2c8dcad2a26d84a07d007dc08f35c5548a32d.zip
Merge updates from master
Diffstat (limited to 'profiles')
-rw-r--r--profiles/package.mask18
1 files changed, 6 insertions, 12 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 878677bf10d1..07cd7587b1bb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -387,8 +387,12 @@ net-libs/nDPI
=mail-mta/postfix-3.6*
# Miroslav Šulc <fordfrog@gentoo.org> (2020-02-27)
-# Depends on dev-java/eclipse-ecj:4.13 which
-# depends on >=virtual/{jdk,jre}-11 which is masked
+# dev-java/ant-eclipse-ecj:4.10 depends on masked >=virtual/{jdk,jre}-11
+# www-servers/tomcat:9 depends on masked dev-java/eclipse-ecj:4.13
+dev-java/ant-eclipse-ecj:4.13
+dev-java/eclipse-ecj:4.13
+dev-java/ant-eclipse-ecj:4.10
+dev-java/eclipse-ecj:4.10
www-servers/tomcat:9
# Mart Raudsepp <leio@gentoo.org> (2020-02-16)
@@ -427,11 +431,6 @@ net-misc/gnome-remote-desktop
# Depends on apache-2.2
dev-libs/OpenSRF
-# Miroslav Šulc <fordfrog@gentoo.org> (2019-10-16)
-# Depends on >=virtual/{jdk,jre}-11 which is masked
-dev-java/ant-eclipse-ecj:4.13
-dev-java/eclipse-ecj:4.13
-
# Matt Turner <mattst88@gentoo.org> (2019-09-01)
# TeXmacs is the only remaining package in tree that requires guile-1.8, which
# is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
@@ -452,11 +451,6 @@ app-office/texmacs
# Requires >=dev-lang/lua-5.3 which is masked
sys-apps/likwid
-# Miroslav Šulc <fordfrog@gentoo.org> (2019-01-23)
-# Depends on >=virtual/{jdk,jre}-11 which is masked
-dev-java/ant-eclipse-ecj:4.10
-dev-java/eclipse-ecj:4.10
-
# Thomas Deutschmann <whissi@gentoo.org> (2018-12-10)
# Requires >=dev-lang/lua-5.2 which is masked
>=app-admin/lsyncd-2.2.3