gentoo resync : 20.05.2018

7 files changed, 26 insertions, 21 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c8acac4f08a2..b29ee81f1f53 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 4df313c54eb3..c0bc70521693 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -18,6 +18,7 @@ app-metrics/collectd collectd_plugins_tokyotyrant
 app-metrics/collectd collectd_plugins_varnish
 app-metrics/collectd collectd_plugins_virt
 app-metrics/collectd collectd_plugins_write_kafka
+app-metrics/collectd collectd_plugins_write_mongodb
 app-metrics/collectd collectd_plugins_xencpu
 app-metrics/collectd collectd_plugins_java
 
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index e3cf93a146a3..836f150764ea 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -160,9 +160,7 @@ dev-scheme/racket futures jit
 # Tests require dev-python/tox which isn't keyworded on arm
 sys-cluster/ceph test
 
-# Thomas Deutschmann <whissi@whissi.de> (19 Mar 2016), on behalf of
-# Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
-# for the proxy-maintainers project
+# Thomas Deutschmann <whissi@gentoo.org> (19 Mar 2016)
 # Unkeyworded deps, bug #564274
 app-metrics/collectd collectd_plugins_gmond
 app-metrics/collectd collectd_plugins_ipmi
@@ -173,6 +171,7 @@ app-metrics/collectd collectd_plugins_sigrok
 app-metrics/collectd collectd_plugins_tokyotyrant
 app-metrics/collectd collectd_plugins_varnish
 app-metrics/collectd collectd_plugins_virt
+app-metrics/collectd collectd_plugins_write_mongodb
 
 # Markus Meier <maekke@gentoo.org> (02 Mar 2016)
 # unkeyworded deps for bug #573324
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 131814c8ceee..27e802707739 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -110,7 +110,7 @@ dev-util/geany-plugins -git
 
 # Brian Evans <grknight@gentoo.org (14 Sep 2015)
 # Unmask new USE flags for mariadb on supported arches
->=dev-db/mariadb-10.1.0 -mroonga -sst-xtrabackup -galera
+>=dev-db/mariadb-10.1.0 -sst-xtrabackup -galera
 
 # Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
 # sys-boot/gnu-efi is not supported on all archs.
diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc
index d58610cb3ceb..39e23e9b5bca 100644
--- a/profiles/desc/collectd_plugins.desc
+++ b/profiles/desc/collectd_plugins.desc
@@ -58,6 +58,7 @@ match_regex - Build the match_regex filter plugin
 match_timediff - Build the match_timediff filter plugin
 match_value - Build the match_value filter plugin
 mbmon - Build the mbmon input plugin (collects information from mainboard sensors)
+mcelog - Build the mcelog input plugin (subscribes to Machine Check Exceptions (MCE) and dispatches notifications)
 md - Build the md input plugin (reports the number of disks in various states in Linux software RAID devices)
 memcachec - Build the memcachec input plugin (queries one or more given pages from a memcached instance and parses the returned data according to user specification)
 memcached - Build the memcached input plugin (collects statistics from memcached daemon)
@@ -81,6 +82,8 @@ onewire - Build the onewire (1-Wire) input plugin (collects temperature informat
 openldap - Build the OpenLDAP input plugin (reads monitoring information from OpenLDAP's cn=Monitor subtree)
 openvpn - Build the openvpn input plugin (reads the status file printed by OpenVPN)
 oracle - Build the oracle input plugin (executes SQL statements against Oracle database systems)
+ovs_events - Build an input plugin which reports link state changes from Open vSwitch (OVS)
+ovs_stats - Build an input plugin which reports bridge and interface statistics from Open vSwitch (OVS)
 perl - Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)
 ping - Build the ping input plugin (measures network latency)
 postgresql - Build the postgresql input plugin (executes SQL statements against a PostgreSQL database)
@@ -97,6 +100,7 @@ serial - Build the serial input plugin (collects the traffic on serial interface
 sigrok - Build the sigrok input plugin (reads measurements from any supported hardware from sigrok project)
 smart - Build the S.M.A.R.T input plugin (collects S.M.A.R.T statistics from disk drives)
 snmp - Build the snmp input plugin (reads values from network devices using SNMP)
+snmp_agent - Build an input plugin which implements an SNMP AgentX subagent that receives and handles queries from SNMP master agent and returns configured metrics
 statsd - Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)
 swap - Build the swap input plugin (collects amount of memory currently written to swap)
 syslog - Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)
@@ -127,6 +131,7 @@ write_graphite - Build the write_graphite output plugin (stores values in Carbon
 write_http - Build the write_http output plugin (sends metrics to a web-server using HTTP POST requests)
 write_kafka - Build the Kafka output plugin (sends metrics to Apache Kafka)
 write_log - Build the write_log output plugin (writes metrics to a file)
+write_mongodb - Build the MongoDB output plugin (stores values in MongoDB)
 write_prometheus - Builds the Prometheus output plugin (starts an internal webserver on port 9103 (configurable) and accepts scrape requests from Prometheus)
 write_redis - Build the Redis output plugin (stores values in Redis)
 write_sensu - Build the Sensu output plugin (sends metrics to Sensu Core, an open-source monitoring project)
diff --git a/profiles/package.mask b/profiles/package.mask
index 4f6ecb0db45d..1191a4c63a9b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (20 May 2018)
+# Unmaintained. Dead homepage. Depends on dead libXfont.
+# Removal in 30 days. Bug #655104
+app-i18n/fbiterm
+
+# Joonas Niilola <juippis@gmail.com> (18 May 2018)
+# Unmaintained, bugs open without activity, makes users
+# install ancient version of enlightenment by typing
+# 'emerge enlightenment' due to obnoxious package slotting.
+# Bug #656020. Removal in ~30 days
+=x11-wm/enlightenment-1.0.17
+=x11-wm/enlightenment-0.16.9999
+app-doc/edox-data
+x11-misc/e16keyedit
+x11-misc/e16menuedit2
+x11-plugins/epplets
+
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # Breaking consumers by internal header cleanup and removal of deprecated
 # qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
@@ -263,16 +280,6 @@ dev-libs/qjson
 # Removal in 30 days.  Bug #454680.
 dev-python/simpleparse
 
-# Matt Turner <mattst88@gentoo.org> (21 Apr 2018)
-# Awful, unmaintained, unused. Removal in 30 days. Bug #651300.
-x11-libs/xpyb
-
-# Matt Turner <mattst88@gentoo.org> (21 Apr 2018)
-# Protocol headers and client library for the long dead Xprint extension.
-# Removal in 30 days. Bug #649076.
-x11-proto/printproto
-x11-libs/libXp
-
 # Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
 # Needs porting of revdeps
 # See: https://bugs.gentoo.org/653678
@@ -283,11 +290,6 @@ x11-libs/libXp
 # Masked for initial testing
 >=dev-db/mysql-connector-c++-8.0.0
 
-# Jason Zaman <perfinion@gentoo.org> (08 Apr 2018)
-# Dead upstream, for an old version of Xfce
-# Masked for removal in 30 days.
-xfce-extra/xfce-theme-manager
-
 # Rick Farina <zerochaos@gentoo.org> (04 Apr 2018)
 # Violates PMS and does not work with stable portage.
 # Masked for removal in 60 days, lift mask if bug #650126 is fixed
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 10db1a3bac90..abb8fb31b005 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -978,13 +978,11 @@ app-misc/vcontrold:man - Build the manpages
 app-misc/vcontrold:vclient - Build the vclient helper program to talk to vcontrold
 app-misc/vcontrold:vsim - Build the vsim helper program (simulates the heating's answers, for development and debugging)
 app-misc/vifm:X - Add support for X11
-app-misc/vifm:compatibility - Compatibility with previous versions of vifm
 app-misc/vifm:developer - Enable features of interest to developers
 app-misc/vifm:extended-keys - Support for extended keys (arrows, home etc)
 app-misc/vifm:gtk - Use gtk+ to determine mimetypes
 app-misc/vifm:magic - Use libmagic to determine mimetypes
 app-misc/vifm:vim - Install the vifm vim plugin and vim-compatible documentation
-app-misc/vifm:vim-plugin - Install the vifm vim plugin
 app-misc/vifm:vim-syntax - Pulls in related vim syntax scripts
 app-misc/worker:avfs - Enable support for sys-fs/avfs
 app-misc/worker:magic - Add magic file support from sys-apps/file to automatically detect file types