gentoo resync : 13.03.2018

16 files changed, 146 insertions, 193 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7ac60b8e76ef..2b859ce3b164 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index b5cf9e6c62ca..de9bb726ea74 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (11 Mar 2018)
+# Testing requires having libc++ built against libc++abi right now
+# (and we force linking to libcxxrt).
+sys-libs/libcxxabi test
+
 # Michał Górny <mgorny@gentoo.org> (02 Mar 2018)
 # Someone needs to test the driver.
 x11-base/xorg-drivers video_cards_amdgpu
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index c304dcf8237c..29c4e3c459ff 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (12 Mar 2018)
+# Requires masked net-misc/curl with libressl.
+dev-libs/libgit2 libressl
+
 # Michał Górny <mgorny@gentoo.org> (03 Mar 2018)
 # Requires masked dependent flags.
 net-fs/samba ads
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index aaeb6258c961..40fb7091c901 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -3,6 +3,18 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matt Turner <mattst88@gentoo.org> (10 Mar 2018)
+# sys-block/open-iscsi has not been tested on HPPA
+iscsi
+
+# Matt Turner <mattst88@gentoo.org> (10 Mar 2018)
+# sys-boot/plymouth has not been tested on HPPA
+plymouth
+
+# Matt Turner <mattst88@gentoo.org> (10 Mar 2018)
+# sys-fs/dmraid has not been tested on HPPA
+dmraid
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 8761fea48606..31362741dc8e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Mar 2018)
+# missing keyword on media-libs/portmidi
+media-sound/hydrogen portmidi
+
 # Gilles Dartiguelongue <eva@gentoo.org> (16 Aug 2017)
 # missing keyword on dev-python/dbusmock, bug #620024
 >=gnome-base/gnome-settings-daemon-3.24 test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 73d04afca336..6ac1e78c24a2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# libewf is going to be removed, bug #547418
+app-admin/testdisk ewf
+app-forensics/sleuthkit ewf
+
 # Patrick McLean <chutzpah@gentoo.org> (6 Mar 2018)
 # Requires dev-libs/boost-1.66 that is unkeyworded/masked
 >=sys-cluster/ceph-12.2.4 system-boost
diff --git a/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/17.0/musl/selinux/eapi b/profiles/default/linux/x86/17.0/musl/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/musl/selinux/parent b/profiles/default/linux/x86/17.0/musl/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/license_groups b/profiles/license_groups
index ee18a412c5fc..4e85847f2ace 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 4c36d030ff44..d39db1155481 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,90 @@
 
 #--- END OF EXAMPLES ---
 
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Tests need network, nothing requires this old lib anymore and upstream is
+# dead for a long time (#335233). Removal in a month.
+net-libs/netembryo
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build (#371401, #642676). Removal in a month.
+net-misc/netkit-rwall
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Incomplete and unclear LICENSE, missing files in SRC_URI (#472602).
+# Removal in a month.
+sci-electronics/balsa
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Upstream dead for a long time, requires obsolete gstreamer and other old
+# libs (#629192), buggy (#490344). Removal in a month.
+media-tv/me-tv
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Doesn't build for a long time (#514432). Removal in a month.
+sci-biology/beast-mcmc
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build (#514632, #585606, #588710). Removal in a month.
+sys-power/phc-k8
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Fails to build for a long time (#515734, 649840). Removal in a month.
+sys-fs/gfs2-utils
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Dead driver and with many incompatibilities with current kernels (#517250,
+# #523356, #551834, #646106). Removal in a month. Possible alternative
+# #device/driver: https://bugs.gentoo.org/517250#c5
+net-wireless/broadcom-sta 
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Not buildable for a long time (#531586), pending many version bumps.
+# Removal in a month.
+media-sound/mup
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Many other ident daemons in the tree over this completely dead and
+# unmaintained (since 2003) implementation (#535868). Removal in a month.
+net-misc/linux-identd
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Major version bump pending (#540322), current version in the tree is
+# completely broken in several ways (#471428, #598260, #621784, #638364).
+# Removal in a month.
+sys-cluster/gearmand
+dev-php/pecl-gearman
+
+# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
+# Not buildable and ends up needing old guile-1.8 (#547186, #617802), major
+# version bump pending (#515888). Removal in a month.
+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)
+# Many pending version bumps (#574874), doesn't run (#587112), doesn't use
+# python eclasses (#613892), needs obsolete libs (#640888). Removal in a
+# month.
+net-p2p/tribler
+
+# Tobias Klausmann <klausman@gentoo.org (13 Mar 2018)
+# Has a bug in the storage engine, details:
+# https://www.robustperception.io/new-features-in-prometheus-2-2-0/
+# https://github.com/prometheus/prometheus/issues/3943
+=net-analyzer/prometheus-2.2.0
+
+# Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
+# Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
+>=x11-base/xorg-server-1.19.7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (11 Mar 2018)
+# Dead upstream, no revdeps left. Bug #639358
+app-i18n/libguess
+
 # José María Alonso <nimiux@gentoo.org> (09 Mar 2018)
 # Obsolete package
 # Masked for removal in 30 days. Bug #646742
@@ -58,11 +142,6 @@ media-gfx/qosmic
 # Bug 649764 Removal in 30 days.
 dev-db/maxscale
 
-# Lars Wendler <polynomial-c@gentoo.org> (06 Mar 2018)
-# Masked as it breaks x2go
-=net-misc/nx-3.5.99.15
-=net-misc/x2goserver-4.1.0.0-r1
-
 # Andreas Sturmlechner <asturm@gentoo.org> (06 Mar 2018)
 # Maintainer not responding, depends on deprecated Qt4.
 # Masked for removal in 30 days. Bug 598651, 635192, 644396
@@ -265,11 +344,6 @@ media-gfx/qiviewer
 # Bug: #647352
 app-crypt/monkeysign
 
-# Michael Palimamka <kensington@gentoo.org> (11 Feb 2018
-# Fails to build (bug #538400). Requires dead Qt 4 (bug #637014).
-# Dead upstream. Masked for removal in 30 days.
-media-sound/lastfmplayer
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
@@ -283,21 +357,6 @@ media-sound/lastfmplayer
 =sys-firmware/intel-microcode-20180108
 =sys-firmware/intel-microcode-20180108-r1
 
-# Matt Turner <mattst88@gentoo.org> (06 Feb 2018)
-# Dead and unused
-# Masked for removal in 30 days. Bug #646838
-x11-libs/libXCalibrate
-x11-libs/libXfontcache
-x11-misc/xtscal
-x11-proto/fontcacheproto
-x11-proto/xcalibrateproto
-x11-proto/xf86rushproto
-
-# Tim Harder <radhermit@gentoo.org> (05 Feb 2018)
-# Unmaintained, replaced by newsboat fork.
-# Masked for removal in 30 days.
-net-news/newsbeuter
-
 # Patrice Clement <monsieurp@gentoo.org> (26 Jan 2018)
 # Has different symbols. Known to cause issues with i3bar/swaybar.
 media-fonts/fontawesome:0/5
@@ -311,19 +370,12 @@ media-fonts/fontawesome:0/5
 # mpv >= 0.28.0 requires changes currently only available in ffmpeg-9999.
 >=media-video/mpv-0.28.0
 
-# Michał Górny <mgorny@gentoo.org> (10 Jan 2018)
-# The Fuzzer library is now installed as part of core LLVM. That's
-# sys-devel/llvm in LLVM 5, and sys-libs/compiler-rt-sanitizers
-# in LLVM 6 and newer. The separate ebuild was never approved by LLVM
-# maintainers or actually maintained, and is obsolete for a long time.
-# Removal in 30 days.
-dev-libs/libFuzzer
-
 # Richard Freeman <rich0@gentoo.org> (09 Jan 2018)
 # Bug 644048 - temp QA mask until it can get sorted out
 # Lars Wendler <polynomial-c@gentoo.org> (26 Feb 2018)
 # See also tracker bug: https://bugs.gentoo.org/648864
 ~sys-apps/attr-2.4.48
+
 # Lars Wendler <polynomial-c@gentoo.org> (10 Jan 2018)
 # Mask followup bugfixes for =sys-apps/attr-2.4.48 as well until proper
 # testing has been conducted.
@@ -343,123 +395,6 @@ dev-libs/libFuzzer
 =sys-kernel/gentoo-sources-4.14.10-r1
 =sys-kernel/gentoo-sources-4.14.11
 
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Fails to fetch (#597424). Removal in a month.
-sci-chemistry/platon
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Multiple build issues (#423471, #529772, #558206, #574910, #603304,
-# #638602), problems with init.d scripts (#390231), major version bump
-# #pending to be done (#610744). Removal in a month.
-sys-fs/ocfs2-tools
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Fails to build, a major version bump is needed but it's hard to bump
-# (#626050, #626052). Removal in a month.
-net-nds/ypserv
-net-nds/ypbind
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream is died, no server still usable for this (#626770). Removal in a
-# month.
-games-arcade/bloboats
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream dead, not compatible with latest mariadb, nothing requires this
-# in the tree (#628526, #629470, #629552, #629712, #629978, #630002,
-# #630098, #630650). Removal in a month.
-dev-db/lib_mysqludf_fPROJ4
-dev-db/lib_mysqludf_preg
-dev-db/lib_mysqludf_ta
-dev-db/lib_mysqludf_stat
-dev-db/lib_mysqludf_str
-dev-db/lib_mysqludf_udf
-dev-db/lib_mysqludf_sys
-dev-db/lib_mysqludf_json
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Fails multilib-strict check (#628836). Nothing requires it. Removal in a
-# month.
-dev-libs/dclog
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Tries to install at pkg_postinst phase (#628804). Removal in a month.
-app-misc/misterhouse
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Configure hangs (#628726), a major version bump is needed (#510050).
-# Removal in a month.
-app-forensics/autopsy
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Deprecated tools replace by dev-python/awscli (#633374). Removal in a
-# month.
-app-admin/aws-as-tools
-app-admin/aws-cw-tools
-app-admin/aws-iam-tools
-app-admin/aws-rds-tools
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Relies on obsolete code.google, nothing uses it at present time (#633984).
-# Removal in a month.
-net-misc/slimrat
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream dead, fails to fetch (#586504, #640546, #636466). Removal in a
-# month.
-games-emulation/xe
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Fails to build (#637612). Removal in a month.
-net-vpn/htun
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Unmaintained, fails to build (#638628). Removal in a month.
-media-sound/nted
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Fails to build (#638634). Removal in a month.
-sys-apps/raidutils
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Tries to download and compile other tools, build fails then (#639060).
-# Removal in a month.
-dev-lang/fsharp
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Dead since 2007, fails to build (#639510). Removal in a month.
-net-irc/ultimate
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Relies on dead gnome2 python bindings, seems dead since 2009 (#640028),
-# removal in a month.
-sys-power/phctool
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream stopped its development as recent Gnome versions don't need it,
-# it relies on gnome2 python bindings and many other dead libs (#640032).
-# Removal in a month.
-app-misc/specto
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream dead, relies on gnome2 python bindings and other dead libs
-# (#640070). Removal in a month.
-x11-plugins/thinkhdaps
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Cannot be installed (#640414). Removal in a month.
-net-misc/asterisk-rate_engine
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Dead for ages and replaced by app-admin/procinfo-ng (#641016). Removal in
-# a month.
-app-admin/procinfo
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream dead, fails to build, nothing requires it (#641750). Removal in a
-# month.
-net-misc/bti
-
 # Alice Ferrazzi <alicef@gentoo.org> (30 Dec 2017)
 # Masked for removal in 30 days.
 # Upstream is no more backporting security fixes for 4.12.
@@ -469,17 +404,6 @@ net-misc/bti
 =sys-kernel/gentoo-sources-4.12.13
 =sys-kernel/gentoo-sources-4.12.12
 
-# David Seifert <soap@gentoo.org> (29 Dec 2017)
-# Last release in 2003, EAPI 0, C++ extremely broken
-# Removal in 30 days
-app-admin/jinit
-
-# Pacho Ramos <pacho@gentoo.org> (27 Dec 2017)
-# Out ebuild is completely obsolete (#381073), download manually PPD is
-# preferred, current tarballs cannot be downloaded even (#635146). Removal
-# in a month.
-net-print/xerox-drivers
-
 # Alice Ferrazzi <alicef@gentoo.org> (27 Dec 2017)
 # Masked for removal in 30 days.
 # This kernel doesn't boot on hardened profiles.
@@ -512,12 +436,6 @@ net-print/xerox-drivers
 # Masked for testing
 =dev-libs/libical-3.0.1
 
-# Patrice Clement <monsieurp@gentoo.org> (19 Dec 2017)
-# A slightly better syntax file for PAM configuration files is shipped with Vim
-# since version 8.0. The one we package is old and out of date.
-# Masked for removal in 30 days. See bug 578278.
-app-vim/pam-syntax
-
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
@@ -557,15 +475,6 @@ games-kids/crayon-physics
 # Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620702
 <media-gfx/freecad-0.18
 
-# Jonas Stein <jstein@gentoo.org> (11 Nov 2017)
-# The upstream developer and former maintainer asked to treeclean these
-# packages, because they can be used only with the Siemens Mediacenter
-# Activy 3xx which was produced till 2005. He confirmed, that no user
-# is left who needs the package from our tree for this special hardware.
-# See also bug #633098. Masked for removal on 2018-01-31
-app-misc/activylircd
-media-plugins/vdr-alcd
-
 # Mike Gilbert <floppym@gentoo.org> (05 Nov 2017)
 # Breaks several reverse dependencies.
 # https://bugs.gentoo.org/635934
@@ -714,14 +623,6 @@ dev-lang/spidermonkey:52
 # upstream.
 >=app-text/jabref-bin-4.0
 
-# Nicolas Bock <nicolasbock@gentoo.org> (6 Dec 2017)
-# Development has ceased, the last commit to the upstream repository was
-# on 16 July 2016 with a note stating that its status is unmaintained [1].
-# See also Bug 640034.
-#
-# [1] https://github.com/projecthamster/hamster/commit/c3e5fb761c88fdecfd1566cac8b6836228a27cce
-app-office/hamster-time-tracker
-
 # Pacho Ramos <pacho@gentoo.org> (14 Jul 2017)
 # Doesn't work with >=openvpn-2.3, bug 470696
 # Fix is work in progress, see above bug. dilfridge@g.o
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index cd0aa4ef5dba..095bcbda726b 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrey Utkin <andrey_utkin@gentoo.org> (11 Mar 2018)
+# This flag can be sensibly enabled only on macos
+# hence it is masked in base profile. Bug #637482
+media-video/ffmpeg -appkit
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
 # JavaFX is included on Mac OS. I think a browser plugin is too but as
 # libjvm rather than libnpjp2 like on Linux so keep nsplugin masked.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 7ae807fe36b4..a1a9e1947726 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -288,6 +288,7 @@ amd64		default/linux/musl/amd64/x32				exp
 amd64		hardened/linux/musl/amd64/x32				exp
 amd64		default/linux/amd64/17.0/musl				exp
 amd64		default/linux/amd64/17.0/musl/hardened			exp
+amd64		default/linux/amd64/17.0/musl/hardened/selinux		exp
 arm		default/linux/musl/arm/armv7a				exp
 arm		hardened/linux/musl/arm/armv7a				exp
 arm		default/linux/arm/17.0/musl/armv7a			exp
@@ -303,6 +304,7 @@ ppc		hardened/linux/musl/ppc					exp
 x86		default/linux/musl/x86					exp
 x86		hardened/linux/musl/x86					exp
 x86		default/linux/x86/17.0/musl				exp
+x86		default/linux/x86/17.0/musl/selinux			exp
 
 # Non-embedded uclibc profiles
 # @MAINTAINER: uclibc@gentoo.org
diff --git a/profiles/targets/systemd/package.use b/profiles/targets/systemd/package.use
new file mode 100644
index 000000000000..d0552f6cb8ba
--- /dev/null
+++ b/profiles/targets/systemd/package.use
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (12 Mar 2018)
+# Satisfy REQUIRED_USE by default, bug 650030.
+net-nds/rpcbind warmstarts
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c5f3c3110be6..75247fddf3a7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -837,7 +837,6 @@ app-leechcraft/lc-gmailnotifier:notify - Pull in a plugin to show notifications
 app-leechcraft/lc-gmailnotifier:quark - Pull in a plugin to show GMail Notifier's quark
 app-leechcraft/lc-lmp:fradj - Build FrAdj, the equalizer effect module
 app-leechcraft/lc-lmp:graffiti - Build media tags editor plugin
-app-leechcraft/lc-lmp:guess - Enable tags encoding guessing via the libguess library
 app-leechcraft/lc-lmp:mp3tunes - Build plugin for supporting the mp3tunes.com music locker service
 app-leechcraft/lc-lmp:mpris - Enable MPRIS support
 app-leechcraft/lc-lmp:potorchu - Enable the projectM-based visualization effects module for LMP
@@ -1892,7 +1891,10 @@ dev-lang/lua:deprecated - make deprecated data structures/routines available
 dev-lang/luajit:lua52compat - Enable some upwards-compatible features from Lua 5.2 that are unlikely to break existing code.
 dev-lang/mercury:erlang - Support Mercury Erlang grade
 dev-lang/mercury:trail - Support Mercury trail grades
-dev-lang/mlton:binary - install a binary version (need to do this once to bootstrap, until smlnj is supported)
+dev-lang/mlton:binary - install a binary version
+dev-lang/mlton:bootstrap-smlnj - Boostrap mlton with dev-lang/smlnj (takes a long time)
+dev-lang/mlton:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/mlton:stage3 - After bootstrap building mlton with dev-lang/smlnj, rebuild mlton with the second stage build of mlton (recommended).
 dev-lang/moarvm:asan - Enable clang's Address Sanitizer functionality. Expect longer compile time.
 dev-lang/moarvm:clang - Use clang compiler instead of GCC
 dev-lang/moarvm:jit - Enable Just-In-Time-Compiler. Has no effect except on AMD64 and Darwin.
@@ -1953,6 +1955,7 @@ 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)
 dev-lang/spidermonkey:debug - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems
 dev-lang/spidermonkey:system-icu - Use the system-wide dev-libs/icu instead of bundled -- note, only takes effect when icu flag is enabled
@@ -2105,6 +2108,7 @@ dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
 dev-libs/libgdata:gnome-online-accounts - Enable net-libs/gnome-online-accounts support
+dev-libs/libgit2:curl - Use net-misc/curl for HTTP support (otherwise, limited built-in implementation will be used)
 dev-libs/libgit2:gssapi - Enable GSSAPI support for SPNEGO auth
 dev-libs/libgit2:ssh - Enable SSH transport support
 dev-libs/libgit2:trace - Enable tracing support
@@ -3551,6 +3555,7 @@ kde-frameworks/kwallet:man - Build and install man pages
 kde-frameworks/kxmlgui:attica - Enable support for kde-frameworks/attica
 kde-frameworks/networkmanager-qt:teamd - Enable Teamd control support
 kde-frameworks/plasma:gles2 - Use GLES 2.0 or later instead of full OpenGL
+kde-frameworks/prison:qml - Enable QML/QtQuick support via dev-qt/qtdeclarative
 kde-frameworks/purpose:kaccounts - Enable support for system-wide defined KAccounts
 kde-frameworks/sonnet:aspell - Enable the app-text/aspell spell-checking backend
 kde-frameworks/sonnet:hunspell - Enable the app-text/hunspell spell-checking backend
@@ -4343,6 +4348,7 @@ media-libs/svgalib:kernel-helper - Build the helper kernel module
 media-libs/taglib:boost - Use dev-libs/boost instead of GCC built-ins
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
 media-libs/vigra:valgrind - Enable valgrind in make check
+media-libs/vulkan-loader:demos - Build vulkan demos and vulkaninfo
 media-libs/waffle:egl - Enable EGL support
 media-libs/waffle:gbm - Enable support for the Generic Buffer Manager (gbm)
 media-libs/waffle:wayland - Enable Wayland support
@@ -6546,7 +6552,6 @@ net-misc/seafile-client:shibboleth - Build support for Shibboleth single sign-on
 net-misc/sitecopy:rsh - This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.
 net-misc/sitecopy:webdav - Enable WebDav (Web-based Distributed Authoring and Versioning) support. This system allows users to collaborate on websites using a web based interface. See the ebuild for an FAQ page. Enables neon as well to handle webdav support.
 net-misc/sks:optimize - Enables bytecode optimization
-net-misc/slimrat:X - Install also GUI client
 net-misc/spice-gtk:dbus - Support for desktop integration such as automounting and other APIs exposed by your DE via D-Bus
 net-misc/spice-gtk:gstaudio - Using gstreamer backend as audio decodec support
 net-misc/spice-gtk:gstvideo - Using gstreamer backend as video decodec support
@@ -7749,7 +7754,7 @@ sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:pfm - build the cpacfstats tool
 sys-apps/s390-tools:zfcpdump - build the kernel disk dumping utility
 sys-apps/s390-tools:zlib - build the zgetdump utility
-sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
+sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands). Note: This may break many configure scripts, so it should be avoided on dev systems (and generally used on binpkg/final systems only).
 sys-apps/selinux-python:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
 sys-apps/smartmontools:caps - Build against sys-libs/libcap-ng to allow smartd to drop its privileges.
 sys-apps/smartmontools:daemon - Install the monitoring daemon (smartd) and associated scripts.
@@ -8200,7 +8205,6 @@ sys-fs/multipath-tools:rbd - Enable Rados block device support via sys-cluster/c
 sys-fs/ntfs3g:external-fuse - Use external FUSE library instead of internal one. Must be disabled for unprivileged mounting to work.
 sys-fs/ntfs3g:ntfsdecrypt - Build and install the ntfsdecrypt application.
 sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs.
-sys-fs/ocfs2-tools:external - Enable external locking
 sys-fs/owfs:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 sys-fs/owfs:ftpd - Enable building the OWFS FTP server (owftpd)
 sys-fs/owfs:fuse - Enable building the FUSE-based OWFS client (owfs)
@@ -8361,7 +8365,6 @@ sys-power/nut:ups_drivers_usbhid-ups - Driver for USB/HID UPS equipment
 sys-power/nut:ups_drivers_victronups - Driver for IMV/Victron UPS unit Match, Match Lite, NetUps
 sys-power/nvclock:gtk - Install the GTK+ based graphical interface
 sys-power/nvclock:nvcontrol - Add NVCONTROL support for OpenGL options
-sys-power/phctool:sudo - Enable support for sudo to run gui from non-root user
 sys-power/pm-utils:ntp - Install support for net-misc/ntp
 sys-power/powermgmt-base:pm-utils - Adds support for on_ac_power through sys-power/pm-utils
 sys-power/sispmctl:gemplug - Install gemplug (management script)