summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-07-16 21:23:23 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-07-16 21:23:23 +0000
commitcfa3aeb90d7f04a3922dc60e93704c77aed86631 (patch)
tree937c898cdc20c0692a771fda1b6a783ca7f35e87 /profiles
parent2017-07-16 21:03:54 UTC (diff)
parentsys-apps/systemd: give 234 some keywords (diff)
downloadgentoo-cfa3aeb90d7f04a3922dc60e93704c77aed86631.tar.gz
gentoo-cfa3aeb90d7f04a3922dc60e93704c77aed86631.tar.bz2
gentoo-cfa3aeb90d7f04a3922dc60e93704c77aed86631.zip
Merge updates from master
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/package.use.mask4
-rw-r--r--profiles/package.mask5
2 files changed, 4 insertions, 5 deletions
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6a02be3424d0..8fae51407a92 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2017)
+# Causes build to fail with ffmpeg-3, #602786
+www-plugins/gnash vaapi
+
# Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
# system-renpy cannot be really used and it's going to be treecleaned, bug #587872
games-misc/katawa-shoujo system-renpy
diff --git a/profiles/package.mask b/profiles/package.mask
index e6cceffcd3c3..8a648aa3e10b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -423,11 +423,6 @@ app-emulation/vmware-modules
app-emulation/vmware-tools
# Pacho Ramos <pacho@gentoo.org> (17 Jun 2017)
-# Not compatible with ffmpeg-3 (#602786), other bug reports and NPAPI
-# plugins support in main browsers is dying. Removal in a month.
-www-plugins/gnash
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2017)
# Not compatible with ffmpeg-3 (#589806) and needs vulnerable qtwebkit:4
# (#620740). Removal in a month.
net-voip/homer