gentoo resync : 30.06.2018

18 files changed, 36 insertions, 42 deletions

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 2b07bcf07856..184cd2140c83 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -31,3 +31,8 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e
 # Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
 # Temporary entry to support stable bug 639476
 RUBY_TARGETS="ruby22"
+
+# Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index cd573e22b0ec..287262d2c757 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -344,13 +344,6 @@ gnome-extra/libgda reports
 >=dev-db/mariadb-5.5 tcmalloc
 >=dev-db/percona-server-5.5 tcmalloc
 
-# Raúl Porcel <armin76@gentoo.org> (25 Jun 2012)
-# dev-qt/qtwebkit doesn't seem to work
-dev-python/PyQt4 webkit
-dev-qt/assistant webkit
-dev-qt/designer webkit
-dev-qt/qtdeclarative webkit
-
 # Raúl Porcel <armin76@gentoo.org> (28 May 2012)
 # Needs x11-misc/lightdm(which also requires some other deps)
 x11-misc/xscreensaver new-login
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index e04847951cf2..e26995b8a676 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -139,11 +139,6 @@ x11-drivers/xf86-video-ati glamor
 # x11-drivers/xf86-video-tdfx
 x11-base/xorg-drivers video_cards_tdfx
 
-# >=sys-auth/polkit-qt-0.103.0
-# >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
-# >=sys-auth/polkit-kde-agent-0.99
-kde-frameworks/kdelibs policykit
-
 # <=sci-geosciences/gpsd-2.95-r1
 app-misc/geoclue gps
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 5109e4af610f..0ea0ff752737 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Rick Farina <zerochaos@gentoo.org> (27 Jun 2018)
+# Catalyst has support for assembling bootloader on this arch
+dev-util/catalyst -system-bootloader
+
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d455bec2bdfb..00f710051b5a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -508,11 +508,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/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 26104352bdc7..d64ab3ca19a1 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Akinori Hattori <hattya@gentoo.org> (23 Jun 2018)
+# No stable Java
+dev-db/qdbm java
+
 # Pacho Ramos <pacho@gentoo.org> (28 May 2018)
 # Don't rely on stable inkscape
 app-text/dblatex inkscape
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
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a25dc05caa7a..13505fe222d8 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Rick Farina <zerochaos@gentoo.org> (27 Jun 2018)
+# Catalyst only has support for assembling bootloader on some arches
+dev-util/catalyst system-bootloader
+
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 4322dfd663ac..f598c4237707 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -12,6 +12,5 @@ openal
 gimp
 
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
-# Mask qt4, qt5 for stabilisation timeout, bug #620334
+# Mask qt5 for stabilisation timeout, bug #620334
 qt5
-qt4
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index d23e1f9824c6..5bd683cd03f5 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -34,7 +34,6 @@ ldap
 slang
 diet
 gtk
-qt4
 mono
 python
 cairo
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 408684cacb32..c8ca77a2afea 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -99,14 +99,6 @@ dev-libs/efl physics
 # sys-devel/clang is not keyworded
 app-doc/doxygen clang
 
-# Davide Pesavento <pesa@gentoo.org> (02 Jun 2014)
-# dev-qt/qtdeclarative:4 is not keyworded on mips
-dev-qt/designer:4 declarative
-
-# Davide Pesavento <pesa@gentoo.org> (02 Jun 2014)
-# connman and networkmanager are not keyworded on mips
-dev-qt/qtbearer:4 connman networkmanager
-
 # Sergey Popov <pinkbyte@gentoo.org> (02 Feb 2014)
 # media-gfx/nvidia-texture-tools is not keyworded on mips
 media-libs/devil	nvtt
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1a3eba7d3b0b..5668fa2390af 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -116,7 +116,6 @@ dev-python/PyQt5 bluetooth location webengine
 # Requires unkeyworded dependencies
 dev-vcs/subversion kwallet
 games-arcade/jumpnbump kde
-kde-frameworks/kdelibs handbook policykit
 net-irc/quassel kde
 net-libs/libproxy kde
 sys-auth/polkit kde
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index c361207bea32..3539a4710a08 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -39,7 +39,6 @@ lucene
 bluetooth
 pcmcia
 cdr
-qt4
 gpm
 3dfx
 acpi
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index 648703d97228..ab2eb62dfa08 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -45,7 +45,6 @@ dmi
 scanner
 gphoto2
 dvb
-qt4
 kde
 diet
 lirc
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index daa11d4de6af..32ca3073612b 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -38,3 +38,8 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 # 2006/10/05 - Gustavo Zacarias <gustavoz@gentoo.org>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
+
+# Sergei Trofimovich <slyfox@gentoo.org> (24 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 9f057c9bc06d..10c8ff58fd6e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Rick Farina <zerochaos@gentoo.org> (27 Jun 2018)
+# Catalyst has support for assembling bootloader on this arch
+dev-util/catalyst -system-bootloader
+
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.