Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

13 files changed, 20 insertions, 57 deletions

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