gentoo resync : 04.05.2018

6 files changed, 2 insertions, 25 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 83d057146fd4..f26398883da1 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 926766099c9d..649c65331dde 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -137,6 +137,7 @@ games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
 games-strategy/heroes3-demo
+games-strategy/knights-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
diff --git a/profiles/package.mask b/profiles/package.mask
index b53491fff102..9a8f0a752c5d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -180,13 +180,6 @@ kde-misc/ktexteditorpreviewplugin
 # See tracker bug #653464
 >=app-text/poppler-0.64.0
 
-# Lars Wendler <polynomial-c@gentoo.org> (17 Apr 2018)
-# Changed output for ELF files, which results in no files (either
-# executables or libraries) being stripped.
-# Masked for about two weeks so package managers can be adjusted.
-# See https://bugs.gentoo.org/653352
->=sys-apps/file-5.33
-
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Apr 2018)
 # Depends on dead Qt4. Switch to media-gfx/scantailor-advanced instead.
 # Masked for removal in 30 days. Bug #633386
@@ -222,16 +215,6 @@ media-video/bdsup2sub++
 sys-fs/aufs3
 sys-fs/aufs4
 
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Apr 2018)
-# Dead upstream, depends on dead PyQt4.
-# Masked for removal in 30 days. Bugs #649118, #510066
-media-video/subdownloader
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Apr 2018)
-# Build issues, depends on dead Qt4, no port to Qt5 (or far from ready).
-# Masked for removal in 30 days. Bugs #620474, #624740, #648668
-sci-electronics/qucs
-
 # Michał Górny (03 Apr 2018)
 # Starting with sys-apps/sandbox-2.13+, unloading is possible via
 # disabling (SANDBOX_ON=0) + wiping LD_PRELOAD. This renders the tool
@@ -536,11 +519,6 @@ dev-lang/spidermonkey:52
 >=app-text/jabref-bin-4.0
 
 # Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
-# Doesn't work with >=openvpn-2.3, bug 470696
-# Fix is work in progress, see above bug. dilfridge@g.o
-net-vpn/kvpnc
-
-# Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
 # Randomly broken due to sys-devel/binutils-config bug (#584296).
 # Unmask when it is finally fixed, so people can build the package.
 dev-util/mutrace
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 5438111602b2..7d4b5781c883 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -104,7 +104,7 @@ arm64           default/linux/arm64/17.0                        dev
 arm64           default/linux/arm64/17.0/desktop                exp
 arm64           default/linux/arm64/17.0/desktop/systemd        dev
 arm64           default/linux/arm64/17.0/developer              exp
-arm64           default/linux/arm64/17.0/systemd                exp
+arm64           default/linux/arm64/17.0/systemd                dev
 
 # HPPA Profiles
 # @MAINTAINER: hppa@gentoo.org
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 5f0419ee895a..58910201a65a 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -6,7 +6,6 @@ move app-cdr/k3b kde-apps/k3b
 move net-misc/badvpn net-vpn/badvpn
 move net-misc/freelan net-vpn/freelan
 move net-firewall/ipsec-tools net-vpn/ipsec-tools
-move net-misc/kvpnc net-vpn/kvpnc
 move net-misc/libreswan net-vpn/libreswan
 move net-misc/logmein-hamachi net-vpn/logmein-hamachi
 move net-misc/openconnect net-vpn/openconnect
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index bcf49f369f16..42c8ca5cf78e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3404,7 +3404,6 @@ gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices
 gnome-extra/nm-applet:teamd - Enable teamd configuration editor
 gnome-extra/sushi:office - Support viewing file formats such as generated by app-office/libreoffice
 gnome-extra/synapse:plugins - Build support for plugins using librest
-gnome-extra/synapse:zeitgeist - Add support for Zeitgeist event tracking system
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
 gnustep-base/gnustep-back-art:xim - Enable X11 XiM input method