diff options
Diffstat (limited to 'profiles/package.mask')
| -rw-r--r-- | profiles/package.mask | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index a2b96537a400..72798308a697 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,24 @@ #--- END OF EXAMPLES --- +<<<<<<< HEAD +======= +# Stefan Strogin <steils@gentoo.org> (2019-09-27) +# Requires >=dev-lang/lua-5.3 which is masked +>=dev-util/bam-0.5.0 + +# Michał Górny <mgorny@gentoo.org> (2019-09-27) +# The virtual is not really useful since all reverse dependencies +# support only Python 2.7. All its uses were replaced with direct +# dependencies on dev-python/pmw. +# Removal in 30 days. +virtual/python-pmw + +# Ulrich Müller <ulm@gentoo.org> (2019-09-26) +# Blocks its own dependency. Bug #695606. +=x11-libs/libXvMC-1.0.12 + +>>>>>>> next # Joonas Niilola <juippis@gentoo.org> (2019-09-24) # Upstream decided to deprecate this service, and app. Removal in # ~30 days. Bug #695562 @@ -1081,6 +1099,7 @@ net-misc/libss7 games-rpg/eternal-lands-bloodsucker games-rpg/eternal-lands-data +<<<<<<< HEAD # Michał Górny <mgorny@gentoo.org> (2019-08-28) # Last touched in 2010. EAPI=0. Last upstream release in 2011 (pending # bump). No reverse dependencies. @@ -1131,6 +1150,8 @@ dev-tcltk/tkTheme # Removal in 30 days. Bug #681044. net-misc/tokyotyrant +======= +>>>>>>> next # Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.24 |