Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

18 files changed, 33 insertions, 92 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 04762555f09b..c972d03e1ea8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d46392a89773..c0bc70521693 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Thomas Deutschmann <whissi@gentoo.org> (02 Jun 2018)
-# Needs dev-ruby/asciidoctor which has a lot of unstable deps
-net-analyzer/wireshark doc
-
 # Tobias Klausmann <klausman@gentoo.org> (22 Mar 2018)
 # Masked due to missing deps. Some *could* have their deps keyworded,
 # but we're trying to keep the maintenance load low.
diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 7e9b40c14595..02c2012b8fbe 100644
--- a/profiles/arch/amd64/no-multilib/use.mask
+++ b/profiles/arch/amd64/no-multilib/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # USE flags masked because providing packages have ABI=x86
@@ -7,6 +7,10 @@
 # app-accessibility/mbrola is x86 only
 mbrola
 
+# 2007/08/24 Michael Marineau <marineam@gentoo.org>
+# Xen HVM support requires building 32-bit binaries.
+hvm
+
 # 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Mask multilib, since we cannot use it.
 multilib
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4bb059665fa3..1ccda556fea2 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Mikle Kolyada <zlogene@gentoo.org> (02 Jun 2018)
-# Too many untested ruby dependencies
-<dev-ruby/haml-5 test
-
 # Nick Sarnie <sarnex@gentoo.org> (29 Apr 2018)
 # media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64
 app-emulation/wine-any -vkd3d -vulkan
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index e6b74b911c05..a35448ffbef2 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # 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
@@ -17,9 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
-net-analyzer/wireshark -doc
-
 # Thomas Beierlein <tomjbe@gentoo.org> (20 Apr 2018)
 # Needs asciidoctor which pulls a lot unstable ruby deps
 media-radio/wsjtx doc
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index 7a01f045703d..356f2989cecd 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -1,7 +1,3 @@
 # Anthony Ryan <anthonyryan1@gmail.com> (21 Jan 2017)
 # This package states supports for arm >= v6
 dev-lang/nim
-
-# There is no prebuilt rustc for armv4 by upstream
-dev-lang/rust-bin
-dev-lang/rust
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index 7a01f045703d..8d61e72a31a7 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -2,6 +2,3 @@
 # This package states supports for arm >= v6
 dev-lang/nim
 
-# There is no prebuilt rustc for armv4 by upstream
-dev-lang/rust-bin
-dev-lang/rust
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 5f018a0c3e32..8d61e72a31a7 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -2,6 +2,3 @@
 # This package states supports for arm >= v6
 dev-lang/nim
 
-# There is no prebuilt rustc for armv5 by upstream
-dev-lang/rust-bin
-dev-lang/rust
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index cbe1c0f8f654..836f150764ea 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,14 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Markus Meier <maekke@gentoo.org> (30 May 2018)
-# unkeyworded deps for bug #621434
-net-analyzer/zmap mongo
-
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for arm, bug #653800
 # projectm not yet keyworded, bug #314969
-media-video/vlc aom chromaprint opencv projectm
+media-video/vlc aom chromaprint microdns opencv projectm
 
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux.
@@ -274,6 +271,10 @@ media-libs/clutter-gtk wayland
 dev-python/ipython doc
 dev-python/oct2py doc
 
+# Patrick Lauer <patrick@gentoo.org> (19 Nov 2014)
+# Missing keywords #529820
+app-office/libreoffice collada
+
 # Michael Weber <xmw@gentoo.org> (15 Nov 2014)
 # missing keywords on media-libs/libharu
 www-client/netsurf pdf-writer
@@ -453,7 +454,7 @@ sci-astronomy/kstars indi
 
 # Markus Meier <maekke@gentoo.org> (08 Dec 2012)
 # mask app-office/libreoffice java extensions
-app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher coinmp
+app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher coinmp gltf
 
 # Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
 # No java on ARM
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 47f8e6f3f09d..fadead2adf86 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,16 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Mart Raudsepp <leio@gentoo.org> (30 May 2018)
-# app-text/pandoc not keyworded yet
-app-emulation/xen-tools doc
-dev-python/notebook doc
-
-# Mart Raudsepp <leio@gentoo.org> (30 May 2018)
-# Require old gnome2 libraries, not keywording legacy on purpose
-<=app-editors/gvim-8.0.1699 gnome
-sys-devel/distcc gnome
-
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
 # net-libs/srt not yet keyworded
@@ -138,8 +128,10 @@ dev-libs/dbus-c++ ecore
 
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # USE=eds requires USE=gnome that is masked here.
+# USE=collada requires media-libs/opencollada.
+# USE=gltf requires media-libs/libgltf.
 # USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
-app-office/libreoffice eds postgres
+app-office/libreoffice collada eds gltf postgres
 
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # Requires mail-client/thunderbird* that is not keyworded here.
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index e5624fd13e7b..7ee65d17d708 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,19 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Mart Raudsepp <leio@gentoo.org> (30 May 2018)
-# app-text/docbook2X not stable yet, fails tests (bug #511902)
-dev-vcs/git doc
-
-# Mart Raudsepp <leio@gentoo.org> (29 May 2018)
-# sys-devel/clang, dev-libs/xapian, app-text/texlive not stable yet
-# USE=doc requires USE=latex
-app-doc/doxygen clang doxysearch latex doc
-
-# Mart Raudsepp <leio@gentoo.org> (29 May 2018)
-# virtual/opengl and media-libs/freeglut not stable yet
-media-libs/libwebp opengl
-
 # Mart Raudsepp <leio@gentoo.org> (06 May 2018)
 # No media-libs/freeglut and co stable yet
 media-libs/jasper opengl
@@ -30,6 +17,7 @@ dev-python/urllib3 test
 # Non-stable dependencies.
 app-admin/syslog-ng spoof-source
 app-portage/layman cvs subversion test
+app-text/asciidoc graphviz
 app-text/xmlto latex
 dev-libs/apr-util freetds odbc
 gnome-base/dconf test
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 51ffb918bc86..f15af86c90f9 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -11,6 +11,7 @@ cups
 # Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
 # Not stable yet.
 vala
+webp
 
 # Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
 # Neither x11-libs/gtk+ SLOT marked stable yet
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 051dd2a3ae48..9b4563a8e284 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -3,7 +3,8 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
-media-video/vlc aom
+# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
+media-video/vlc aom microdns
 
 # Anthony G. Basile <blueness@gentoo.org> (14 Apr 2018)
 # net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index d1717d1184de..0613e38e5ad8 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,9 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
-net-analyzer/wireshark -doc
-
 # Andreas Sturmlechner <asturm@gentoo.org> (21 Nov 2017)
 # Requires not yet stabilised media-libs/qtav
 media-gfx/digikam mediaplayer
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4ac5253c5612..0c8ef45efd9a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# kdelibs4 is dead and going away. Bug #645558
+<app-office/libreoffice-6.0 kde
+<app-office/libreoffice-bin-6.0 kde
+<app-office/libreoffice-bin-debug-6.0 kde
+
 # Michał Górny <mgorny@gentoo.org> (16 May 2018)
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 5ba559abf262..e3f945f030f2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,14 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
-# Needs dev-ruby/asciidoctor which has a lot of unstable deps
-net-analyzer/wireshark doc
-
-# Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018)
-# Depends on unstable media-libs/libaom, net-libs/srt
-media-video/vlc aom srt
-
 # Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018)
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
diff --git a/profiles/package.mask b/profiles/package.mask
index d1ff9ba1690c..cadd7cafe8f8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,24 +29,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Mike Pagano <mpagano@gentoo.org> (30 May 2018)
-# Masking due to bad commit in the networking stack.
-=sys-kernel/gentoo-sources-4.14.46
-=sys-kernel/gentoo-sources-4.9.104
-=sys-kernel/gentoo-sources-4.4.134
-=sys-kernel/vanilla-sources-4.14.46
-=sys-kernel/vanilla-sources-4.9.104
-=sys-kernel/vanilla-sources-4.4.134
-
-# Michał Górny <mgorny@gentoo.org> (30 May 2018)
-# Gentoo repository mirrors are now running on Gentoo Infastructure,
-# and the key used to sign commits is appropriately part of the regular
-# keyring (>=app-crypt/openpgp-keys-gentoo-release-20180530).  Please
-# upgrade this keyring, and remove the custom sync-openpgp-key-path from
-# your repos.conf to make Portage use the release keys.
-# Removal in 30 days.
-app-crypt/openpgp-keys-gentoo-mirror
-
 # Chema Alonso Josa <nimiux@gentoo.org> (28 May 2018)
 # Upstream is dead.
 # Masked for removal in 30 days. Bug #646118
@@ -187,6 +169,7 @@ games-misc/dont-starve
 games-puzzle/larry
 games-rpg/avadon
 games-rpg/penumbra-collection
+games-rpg/wasteland2
 
 # Michał Górny <mgorny@gentoo.org> (15 May 2018)
 # All current versions are unfetchable.  No maintainer activity
@@ -469,7 +452,7 @@ media-fonts/fontawesome:0/5
 
 # Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
 # Masked for testing
-~dev-libs/libical-3.0.3
+=dev-libs/libical-3.0.1
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Packages cannot depend
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 14dd30861bc8..1185a3878b02 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1046,12 +1046,15 @@ app-office/kmymoney:quotes - Enable Online Stock Quote retrieval
 app-office/kmymoney:weboob - Enable import of online banking transactions extracted by www-client/weboob
 app-office/kraft:pim - Enable support for KDE PIM resources integration
 app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
+app-office/libreoffice:collada - Enable Collada for rendering 3D models stored in *.dae and *.kmz format
+app-office/libreoffice:gltf - Use media-libs/libgltf for inserting 3D models in the glTF format into presentations
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
 app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
 app-office/libreoffice:gtk3 - Enable experimental gtk3 frontend
 app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
+app-office/libreoffice:quickstarter - Build the system tray quickstarter
 app-office/libreoffice:vlc - Use media-video/vlc for video embedding
 app-office/libreoffice-l10n:offlinehelp - Install help files locally instead of using the LibreOffice Wiki
 app-office/lyx:aspell - Add support for aspell spellchecking
@@ -2086,6 +2089,7 @@ dev-libs/granite:demo - Build the Granite demo application (to present all avail
 dev-libs/hidapi:fox - Build a x11-libs/fox GUI
 dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
 dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
+dev-libs/intel-common:compiler - Install the libraries needed for the icc and ifort compilers
 dev-libs/jemalloc:hugepages - Enable transparent huge page support
 dev-libs/jemalloc:lazy-lock - Enable lazy locking (only lock when multi-threaded)
 dev-libs/jemalloc:stats - Enable statistics calculation/reporting
@@ -3534,7 +3538,7 @@ kde-frameworks/purpose:kaccounts - Enable support for system-wide defined KAccou
 kde-frameworks/sonnet:aspell - Enable the app-text/aspell spell-checking backend
 kde-frameworks/sonnet:hunspell - Enable the app-text/hunspell spell-checking backend
 kde-misc/kdeconnect:app - Enable experimental kcapp frontend
-kde-misc/kdeconnect:mousepad - Enable remote mousepad plugin using x11-libs/libfakekey
+kde-misc/kdeconnect:sms - Enable SMS support using kde-frameworks/kpeople
 kde-misc/kdeconnect:wayland - Enable kwin_wayland support for mousepad plugin using kde-frameworks/kwayland
 kde-misc/kimtoy:scim - Enable Smart Common Input Method support
 kde-misc/kio-gdrive:kaccounts - Use kde-apps/kaccounts-integration backend (default) instead of dev-libs/qtkeychain
@@ -4059,10 +4063,6 @@ media-gfx/ufraw:fits - Enable support for the FITS image format through sci-libs
 media-gfx/ufraw:timezone - enable DST correction for file timestamps
 media-gfx/xpaint:pgf - Support for loading PGF images
 media-gfx/xsane:ocr - Enable support for Optical Character Recognition reader
-media-gfx/yafaray:blender - Install addon for media-gfx/blender
-media-gfx/yafaray:fastmath - Enable mathematic approximations to make code faster
-media-gfx/yafaray:fasttrig - Enable trigonometric approximations to make code faster
-media-gfx/yafaray:opencv - Use media-libs/opencv
 media-libs/a52dec:djbfft - Prefer D.J. Bernstein's library for fourier transforms
 media-libs/allegro:dumb - Enable media-libs/dumb module library support
 media-libs/allegro:physfs - Enable physfs support
@@ -7505,7 +7505,6 @@ sys-apps/coreutils:caps - Add Linux capabilities support in output of file utili
 sys-apps/coreutils:hostname - Build the hostname program
 sys-apps/coreutils:kill - Build the kill program
 sys-apps/coreutils:multicall - Build all tools into a single `coreutils` program akin to busybox to save space
-sys-apps/coreutils:split-usr - Enable this if /bin and /usr/bin are separate directories
 sys-apps/dbus:elogind - Use sys-auth/elogind for session tracking.
 sys-apps/dbus:systemd - Build with sys-apps/systemd at_console support
 sys-apps/dbus:user-session - Enable user-session semantics for session bus under systemd
@@ -8005,7 +8004,6 @@ sys-fabric/ofed:rds - Tools to manage rds sockets
 sys-fabric/ofed:srp - Suport for userspace part for srp initiator
 sys-fabric/opensm:tools - Install ssld extra tool
 sys-firmware/edk2-ovmf:binary - Use pre-built binaries
-sys-firmware/intel-microcode:hostonly - only install ucode(s) supported by currently available (=online) processor(s)
 sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
 sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
 sys-firmware/intel-microcode:split-ucode - install the split binary ucode files (used by the kernel directly)
@@ -8507,7 +8505,6 @@ www-servers/apache:apache2_modules_lbmethod_byrequests - Request counting load b
 www-servers/apache:apache2_modules_lbmethod_bytraffic - Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.
 www-servers/apache:apache2_modules_lbmethod_heartbeat - Heartbeat traffic counting load balancer scheduler algorithm for proxy_balancer.
 www-servers/apache:apache2_modules_macro - Macros for the Apache config file.
-www-servers/apache:apache2_modules_md - Managing domains across virtual hosts, certificate provisioning via the ACME protocol.
 www-servers/apache:apache2_modules_proxy_fcgi - FCGI support module for mod_proxy.
 www-servers/apache:apache2_modules_proxy_html - Module to rewrite links in html pages behind a reverse proxy
 www-servers/apache:apache2_modules_proxy_wstunnel - Provides support for the tunnelling of web socket connections to a backend websockets server.