gentoo resync : 13.10.2019

3 files changed, 2 insertions, 11 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index f15eb9ff2858..acd6cae65a8f 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -37,6 +37,7 @@ dev-util/biew
 games-action/badland
 games-action/beathazardultra
 games-action/brutal-legend
+games-action/crimsonland
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
@@ -46,13 +47,11 @@ games-action/heretic2-demo
 games-action/hotline-miami
 games-action/intrusion2
 games-action/lugaru
-games-action/mutantstorm-demo
 games-action/phobiaii
 games-action/rune
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/solar2
-games-action/spacetripper-demo
 games-action/swordandsworcery
 games-action/trine-enchanted-edition
 games-action/trine2
@@ -100,7 +99,6 @@ games-fps/rtcw
 games-fps/rtcwmp-demo
 games-fps/rtcwsp-demo
 games-fps/sauerbraten
-games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
 games-fps/unreal-tournament
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 82280b43d705..0e8f34e6b6b8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -73,7 +73,6 @@ media-gfx/imagemagick -heif
 
 # Ben Kohler <bkohler@gentoo.org> (2018-08-23)
 # Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/connman -iwd
 net-misc/networkmanager -iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
@@ -200,7 +199,7 @@ net-im/telepathy-connection-managers -steam
 
 # Mike Frysinger <vapier@gentoo.org> (2014-08-04)
 # Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
+sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index c763944dd298..20224b09502d 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -38,10 +38,6 @@ dev-qt/qtsql oci8
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
 
-# Brian Evans <grknight@gentoo.org> (2018-12-06)
-# Unmask argon2 for php
-dev-lang/php -argon2
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # unmask sssd for sudo
 app-admin/sudo -sssd
@@ -49,8 +45,6 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (2018-11-01)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
-# Ben Kohler <bkohler@gentoo.org> (2019-05-22)
-net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-09-15)
 # the dependency is unstable