gentoo Easter resync : 12.04.2020

4 files changed, 17 insertions, 84 deletions

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index acf982948684..4fd7df5d9af7 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ia64"
-ACCEPT_KEYWORDS="ia64"
+ACCEPT_KEYWORDS="ia64 ~ia64"
 
 CHOST="ia64-unknown-linux-gnu"
 CFLAGS="-O2 -pipe"
@@ -31,7 +31,3 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 # Diego Pettenò <flameeyes@gentoo.org> (2006-12-23)
 # Defaults for audio drivers - Took from x86 profile
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
-
-# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
-# Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24 -ruby25"
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 64fd0c52a034..1cc325c0bc09 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-04-11)
+# git useflag requires dev-libs/libgit2
+dev-util/geany-plugins git
+
+# Thomas Deutschmann <whissi@gentoo.org> (2020-03-15)
+# Mask USE=libtesseract, app-text/tesseract is not keyworded
+# Mask USE=dav1d, media-libs/dav1d is not keyworded
+# Mask USE=libaribb24, media-libs/aribb24 is not keyworded
+media-video/ffmpeg dav1d libaribb24 libtesseract
+
+# Mart Raudsepp <leio@gentoo.org> (2020-03-01)
+# Mask until app-text/gspell is keyworded
+mail-client/evolution spell
+
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
 # Mask until dev-libs/libfido2 is keyworded
 net-misc/openssh security-key
@@ -126,12 +140,12 @@ app-shells/bash-completion test
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-17)
 # Pulls in dev-db/redis which is not keyworded on ia64.
-dev-python/pyzor test
+mail-filter/pyzor test
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-17)
 # dev-python/gevent requires dev-python/greenlet which has not been ported to
 # ia64 (bug #538510)
-dev-python/pyzor gevent
+mail-filter/pyzor gevent
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-10)
 # media-libs/libilbc has not been ported to ia64, bug #610546
diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask
deleted file mode 100644
index 85475d744585..000000000000
--- a/profiles/arch/ia64/package.use.stable.mask
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# When you add an entry to the top of this file, add your name, the date, and
-# an explanation of why something is getting masked. Please be extremely
-# careful not to commit atoms that are not valid, as it can cause large-scale
-# breakage, especially if it ends up in the daily snapshot.
-#
-## Example:
-##
-## # Dev E. Loper <developer@gentoo.org> (2012-06-28)
-## # Masking foo USE flag until we can get the
-## # foo stuff to work properly again (bug 12345)
-## =media-video/mplayer-0.90_pre5 foo
-## =media-video/mplayer-0.90_pre5-r1 foo
-#
-
-#--- END OF EXAMPLES ---
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-05-03)
-# Requires net-libs/webkit-gtk. Not stable on ia64.
-dev-util/geany-plugins markdown
-
-# Ulrich Müller <ulm@gentoo.org> (2018-08-09)
-# Needs net-libs/webkit-gtk which is not stable, bug #663248
-app-editors/emacs xwidgets
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2018-01-06)
-# Please unmask after newer dietlibc is finally stable on ia64
-sys-fs/dmraid dietlibc
-
-# Hans de Graaff <graaff@gentoo.org> (2016-04-16)
-# Mask tests on thin-provisioning-tools since the required
-# packages are no longer stable, bug 610088
-sys-block/thin-provisioning-tools test
-
-# Pacho Ramos <pacho@gentoo.org> (2014-07-02)
-# Mask due Gnome3 not going to be stabilized on this arch
-dev-util/geany-plugins gtkspell
->=gnome-base/gnome-desktop-2.32.1-r2 license-docs
-gnome-base/gvfs google
->=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
deleted file mode 100644
index c7768a7961e6..000000000000
--- a/profiles/arch/ia64/use.stable.mask
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
-
-# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
-# Temporary mask for stable bug 688976
-ruby_targets_ruby25
-
-# Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.7 is not stable.
-python_targets_python3_7
-python_single_target_python3_7
-python_targets_python3_8
-python_single_target_python3_8
-
-# Not stable
-mkl
-
-# Pacho Ramos <pacho@gentoo.org> (2014-04-17)
-# Dropped stable keywords after the discussion caused by
-# Gnome 3.8/3.10 stabilization on this arch
-colord
-devhelp
-dia
-eds
-gnumeric
-gusb
-upnp
-upnp-av
-
-# Pacho Ramos <pacho@gentoo.org> (2014-04-13)
-# Not going to be stabilized on this arch
-gnome-online-accounts