gentoo resync : 14.04.2018

14 files changed, 26 insertions, 24 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 68e23ca7aa0d..b281e35ea400 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force
index 73d655ca3cd2..4706847d448c 100644
--- a/profiles/arch/amd64-fbsd/clang/package.use.force
+++ b/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Force building libc++ over libcxxrt.
@@ -14,3 +14,7 @@ net-misc/curl ssl curl_ssl_openssl
 
 # We obviously need clang
 sys-devel/llvm clang static-analyzer default-compiler-rt default-libcxx
+
+# o-flag-munging is required to compile dev-libs/libgcrypt with clang.
+# https://bugs.gentoo.org/629410
+dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 9e7a33af35dc..b4a708c75212 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -464,7 +464,7 @@ app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_ex
 
 # Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
 # No java on ARM
-net-analyzer/wireshark doc-pdf bcg729
+net-analyzer/wireshark doc-pdf bcg729 maxminddb
 
 # Markus Meier <maekke@gentoo.org> (25 Jul 2012)
 # no stable media-video/vlc yet, bug #401313
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index f03d1c27668e..a19bc5001c70 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -27,10 +27,6 @@ net-proxy/haproxy device-atlas
 # Requires a Java dependency
 app-text/tesseract scrollview
 
-# Davide Pesavento <pesa@gentoo.org> (21 Jan 2017)
-# Requires unkeyworded dev-python/PyQt5
-dev-python/qscintilla-python qt5
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (13 Dec 2016)
 # Dropping ppc from sci-libs/armadillo, bug 555896
 sci-libs/gdal armadillo
diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults
index f02939cf2c63..7a7e3bdc53a1 100644
--- a/profiles/arch/powerpc/ppc64/64le/make.defaults
+++ b/profiles/arch/powerpc/ppc64/64le/make.defaults
@@ -6,3 +6,6 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+
+CHOST_ppc64="powerpc64le-unknown-linux-gnu"
+CHOST_ppc="powerpcle-unknown-linux-gnu"
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 6f458c0b70e2..539351b0911a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (11 Apr 2018)
+# ltrace is not ported to powerpc64le yet.
+dev-util/ltrace
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (21 Feb 2018)
 # Mozc supports only little-endian architectures.
 -app-i18n/mozc
diff --git a/profiles/default/linux/uclibc/ppc/package.use.mask b/profiles/default/linux/uclibc/ppc/package.use.mask
index 225a8932960e..0b2122040de3 100644
--- a/profiles/default/linux/uclibc/ppc/package.use.mask
+++ b/profiles/default/linux/uclibc/ppc/package.use.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-# Davide Pesavento <pesa@gentoo.org> (21 Jan 2017)
-# Requires unkeyworded dev-python/PyQt5
-dev-python/qscintilla-python qt5
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Aug 2016)
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/eapi b/profiles/default/linux/x86/17.0/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/hardened/selinux/parent b/profiles/default/linux/x86/17.0/hardened/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
index 58814110cd04..3d6f94331ba3 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -5,10 +5,6 @@
 # Requires masked USE flags.
 sci-libs/gdal mdb
 
-# Davide Pesavento <pesa@gentoo.org> (21 Jan 2017)
-# Requires unkeyworded dev-python/PyQt5
-dev-python/qscintilla-python qt5
-
 # Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
 # Requires unkeyworded dev-qt/qtwebkit:5, which is a PITA to maintain on
 # minor arches and has been declared deprecated by upstream. So we'd like
diff --git a/profiles/package.mask b/profiles/package.mask
index 0cedc5f1bea6..cb84238efb1e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -582,7 +582,6 @@ media-sound/denemo
 
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # Hard to bump (#547418), build issues (#600308). Removal in a month.
-app-forensics/libewf
 app-forensics/rdd
 
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index a1a9e1947726..5438111602b2 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -239,6 +239,7 @@ x86		default/linux/x86/13.0/systemd			stable
 x86             default/linux/x86/17.0                          stable
 x86             default/linux/x86/17.0/selinux                  stable
 x86             default/linux/x86/17.0/hardened                 stable
+x86             default/linux/x86/17.0/hardened/selinux         stable
 x86             default/linux/x86/17.0/desktop                  stable
 x86             default/linux/x86/17.0/desktop/gnome            stable
 x86             default/linux/x86/17.0/desktop/gnome/systemd    stable
diff --git a/profiles/targets/desktop/package.use.mask b/profiles/targets/desktop/package.use.mask
index 26f3c6d94580..bee08748bd6b 100644
--- a/profiles/targets/desktop/package.use.mask
+++ b/profiles/targets/desktop/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (11 Apr 2018)
+# Masked until we have a working ldap patch again.
+# See https://bugs.gentoo.org/652438
+>=net-misc/openssh-7.7_p1 ldap
+
 # USE=gles2 in the following packages disables full OpenGL
 # Upstream does not test for that case and packages frequently
 # fail to build or run if set.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0cf1ce7046cf..cec43a544394 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -161,7 +161,6 @@ app-admin/salt:raet - Add support for the new RAET transport.
 app-admin/salt:redis - Support returning data to a redis database.
 app-admin/salt:timelib - Use timelib to parse english textual date descriptions.
 app-admin/salt:zeromq - Add support for the zeromq transport.
-app-admin/sshguard:ipfilter - Enable ipfilter firewall support (only for *bsd)
 app-admin/sudo:gcrypt - Use SHA2 from dev-libs/libgcrypt instead of sudo's internal SHA2
 app-admin/sudo:offensive - Let sudo print insults when the user types the wrong password
 app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's internal SHA2
@@ -194,6 +193,7 @@ app-admin/webapp-config:portage - Propagete python_targets dependencies to sys-a
 app-admin/yaala:storable - Support for persistence of Perl data structures.
 app-antivirus/clamav:clamdtop - A Top like tool which shows what clamd is currently scanning amongst other things
 app-antivirus/clamav:metadata-analysis-api - Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.
+app-antivirus/clamav:system-libmspack - Use system libmspack instead of built in
 app-arch/cabextract:extras - Install experimental extra tools: wince_info and wince_rename for examining and processing Windows CE installation cabinet header files; cabinfo for examining the structure of a cab file.
 app-arch/cfv:bittorrent - Enable support for checking .torrent files
 app-arch/deltarpm:system-zlib - Use system sys-libs/zlib. Do not enable features of rsync friendly.
@@ -1960,7 +1960,6 @@ dev-lang/rust:clang - Use sys-devel/clang for building
 dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
 dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
 dev-lang/rust:libcxx - Use sys-libs/libcxx as standard library when building with sys-devel/clang
-dev-lang/rust:system-llvm - Use system sys-devel/llvm in place of the bundled one
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -2307,9 +2306,6 @@ dev-libs/xmlsec:openssl - Install xmlsec-openssl library
 dev-libs/xqilla:faxpp - Use dev-libs/faxpp instead of Xerces-C for certain tasks
 dev-libs/xqilla:htmltidy - Use app-text/htmltidy when parsing HTML
 dev-libs/yaz:ziffy - Install ziffy, a promiscuous Z39.50 APDU sniffer
-dev-lisp/abcl:clisp - Build Armed Bear Common Lisp using GNU CLISP
-dev-lisp/abcl:cmucl - Build Armed Bear Common Lisp using CMU Common Lisp
-dev-lisp/abcl:jad - Enable support for disassembling compiled code using JAD
 dev-lisp/clisp:hyperspec - Use local hyperspec instead of online version
 dev-lisp/clisp:new-clx - Build CLISP with support for the NEW-CLX module which is a -C binding to the Xorg libraries
 dev-lisp/clisp:pari - Build CLISP with support for the PARI Computer Algebra System
@@ -5422,7 +5418,6 @@ net-analyzer/wireshark:bcg729 - Use media-plugins/mediastreamer-bcg729 to play G
 net-analyzer/wireshark:capinfos - Install capinfos, to print information about capture files
 net-analyzer/wireshark:captype - Install captype, to print the file types of capture files
 net-analyzer/wireshark:ciscodump - Install ciscodump, extcap interface to capture from a remote Cisco router
-net-analyzer/wireshark:crypt - Use dev-libs/libgcrypt to decrypt traffic
 net-analyzer/wireshark:dftest - Install dftest, to display filter byte-code, for debugging dfilter routines
 net-analyzer/wireshark:doc-pdf - Build documentation in pdf format (US and a4 paper sizes)
 net-analyzer/wireshark:dumpcap - Install dumpcap, to dump network traffic from inside wireshark
@@ -6540,7 +6535,7 @@ net-misc/rdesktop:kerberos - Enable CredSPP support + Kerberos authentication wi
 net-misc/rdesktop:pcsc-lite - Enable smartcard support with sys-apps/pcsc-lite driver
 net-misc/rdesktop:xrandr - Enable XRandR window extension support
 net-misc/remmina:spice - Support connecting to SPICE-enabled virtual machines
-net-misc/remmina:ssh - Enable support for SSH/SFTP protocol; see also 'vte'
+net-misc/remmina:ssh - Enable support for SSH/SFTP protocol
 net-misc/remmina:telepathy - Enable telepathy support
 net-misc/rsync:stunnel - Provide helper scripts for using rsync via >=net-misc/stunnel-4
 net-misc/rygel:tracker - Install dependencies for the tracker plugin
@@ -8080,6 +8075,7 @@ sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
 sys-fs/btrfs-progs:zstd - Enable zstd compression support.
 sys-fs/btrfsmaintenance:systemd - Enable systemd services and timers instead of cron timers
+sys-fs/cryfs:custom-optimization - Use user-defined compiler optimization level
 sys-fs/cryfs:update-check - Enable automatic checking for updates and security vulnerabilities
 sys-fs/cryptsetup:argon2 - Enable password hashing algorithm from app-crypt/argon2
 sys-fs/cryptsetup:gcrypt - Use dev-libs/libgcrypt crypto backend
@@ -8705,7 +8701,6 @@ x11-misc/openbox-menu:icons - Enable support for icons in menus
 x11-misc/openbox-menu:svg - Support SVG icons
 x11-misc/qt5ct:dbus - Enable system tray and global menu support
 x11-misc/qt5ct:systray - Enable system tray support
-x11-misc/redshift:appindicator - Enable usage of dev-libs/libappindicator to export menu options in to unity and KDE 5
 x11-misc/redshift:geoclue - Control dependency on app-misc/geoclue
 x11-misc/rofi:windowmode - Enable normal window mode
 x11-misc/rss-glx:quesoglc - Enable support for OpenGL Character Renderer