gentoo resync : 30.06.2018

3 files changed, 7 insertions, 14 deletions

diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index fe71c0404f27..39ef1e73ab51 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -245,13 +245,6 @@ app-crypt/libsecret test
 # restricted anyway, so no point in pursuing it right now.
 app-shells/bash-completion test
 
-# Alexis Ballier <aballier@gentoo.org> (27 Jun 2017)
-# qtwebkit:4 is old and doesnt build with gcc7, skip it
-dev-python/PyQt4 webkit
-dev-qt/designer:4 webkit
-dev-qt/qtdeclarative:4 webkit
-dev-python/pyside webkit
-
 # Alexis Ballier <aballier@gentoo.org> (21 Jun 2017)
 # Appends -mfpu=neon that doesnt work on arm64
 media-libs/speexdsp cpu_flags_arm_neon
@@ -476,10 +469,6 @@ media-libs/phonon vlc
 # gobject-introspection[doctool], bug #411761
 dev-libs/gobject-introspection -doctool
 
-# Michael Sterrett <mr_bones_@gentoo.org> (04 Mar 2012)
-# arm is missing keywords for >=dev-libs/json-glib-0.12
-app-admin/syslog-ng json
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
 # jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
 # it's masked in base profile and unmasked here (bug #396313).
@@ -511,11 +500,11 @@ sys-auth/polkit kde
 app-text/asciidoc test
 
 # Michael Weber <xmw@gentoo.org> (10 Feb 2011)
-# kde-frameworks/kdelibs is not stable for arm
+# kde-frameworks/kconfig is not stable for arm
 net-libs/libproxy kde
 
 # Raúl Porcel <armin76@gentoo.org> (28 Mar 2010)
-# Needs kde-frameworks/kwallet and kde-frameworks/kdelibs stable
+# Needs kde-frameworks/kwallet, kde-frameworks/ki18n and kde-frameworks/kconfig stable
 dev-vcs/subversion kwallet
 
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index e5624fd13e7b..c59e3c587856 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (28 Jun 2018)
+# net-misc/lksctp-tools not stable yet
+dev-libs/openssl sctp
+net-misc/openssh sctp
+
 # Mart Raudsepp <leio@gentoo.org> (30 May 2018)
 # app-text/docbook2X not stable yet, fails tests (bug #511902)
 dev-vcs/git doc
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 93ab8b7d0b6f..0c08ee777acd 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -155,7 +155,6 @@ sid
 mms
 mtp
 ieee1394
-sctp
 pm-utils
 darcs
 bs2b