gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-admin
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
77 files changed, 768 insertions, 1617 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 114abbed644a..4fcf0595f19c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index c6675d1b035f..1d390b4b2eec 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,13 +1,7 @@
-AUX abrt-2.0.12-automake-1.12.patch 1905 BLAKE2B 303b2626c9bbdcfea7d8b1aad8376d54f5c548b8f8ccbe9998f35f484128b1f9e69f90deaf5fcb099267575e246f18b0bfddf5120ed8979ff49249229fcffb3d SHA512 f29fd4bcb33bb20fd1d555ddc9dc21bb243641bb0d6a44d5a49948f2c6221404482718f4d6a4bb68a8e59945c2ca5566faab2628fa4c98f7900fa76e994ad7cb
-AUX abrt-2.0.12-dbus-fallback.patch 3515 BLAKE2B bedefb2909555ac679e4f316c8ac398a69396f208eddc7576dfa1999a75a51d9da82996588468985323f2d3595a43e3a76ecb1f4505e86a93976ae1f36883ea0 SHA512 6f6c298c14e0f6a0e127c635337883ee9ae3f1afa0229064a7bd2ad9431c5ec144452c33f2ee65a3ba0aebbcd33c10f9688ff8f74a553ad179a3faa098a9dbcd
-AUX abrt-2.0.12-gentoo.patch 13050 BLAKE2B 1f43c99b1d8f2a16c0f238c36c49e8f8437288cc588c434d4de90cf0cc9fbd9dca6408d68a1018fb59e52041d9c08d35fcd2f05a0cbbe0b465b9815023bb8006 SHA512 246eaf8faf1a5793837be94ecc3a56dc37488473140b05c17d6383c235922494468fac7aaa18f50654395c0b4fbaafc904262a3c15a8dc9fc21de320da43bbfa
 AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
-AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42af365a8384be817ff0b891153877d2714f63b9edb8565df503b455824a03f94bc62ef596aa670516d212239922d23e0b62 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71
-DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
 DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
 DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
-EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
 EBUILD abrt-2.10.10-r2.ebuild 2722 BLAKE2B 1d23ed3fb43dc4a9b99d1c7e7aee8a7205455c7e419d70ec8b37d3229c5ce5ea6d6d421243183017ecd4620dc4678731832c5fa80d2e18ed6792124be4e935cd SHA512 e6ba43c2a16c9bcd09c54552b81ca73196335b1a818c50db621726b8d340ef5bcdfaa567e7fcf22de514bd1a80345346a13cfa0c6c193455c08e97c3ee9a83c1
 EBUILD abrt-2.12.0-r1.ebuild 3080 BLAKE2B fe501bcd09a6ce9aaf5fa609588568ad7e9f32a07894241915695369988580b193f0050d91fd83a9fb915b8646d19fcce12714ed5e196216179ec321fb3989be SHA512 4d1094659dd1b93e6e9bccbe51430a6a2091b03d3318d2f600147cc14df6f208c3ffb81cc75c2ef5e6073f7241011133ecb075659411a989840f046f993f723e
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.0.12-r2.ebuild b/app-admin/abrt/abrt-2.0.12-r2.ebuild
deleted file mode 100644
index e9e2cbced8f7..000000000000
--- a/app-admin/abrt/abrt-2.0.12-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# Need gnome2-utils for gnome2_icon_cache_update
-inherit autotools eutils gnome2-utils python-single-r1 systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/btparser-0.18
-	>=dev-libs/glib-2.21:2
-	>=dev-libs/libreport-2.0.11[${PYTHON_USEDEP}]
-	dev-libs/libxml2
-	dev-libs/nss
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	x11-libs/libnotify"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	>=sys-devel/gdb-7"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	# Disable redhat-specific code not usable in gentoo, or that requires
-	# bugs.gentoo.org infra support.
-	epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
-
-	# Using a server response as a format string is a bad idea
-	epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
-
-	# automake-1.12, #427926
-	epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
-
-	# Fix dbus timeout in gui; in next release
-	epatch "${FILESDIR}/${P}-dbus-fallback.patch"
-
-	eautoreconf
-
-	python_fix_shebang .
-}
-
-src_configure() {
-	myeconfargs=(
-		"--localstatedir=${EPREFIX}/var"
-		"$(systemd_with_unitdir)"
-	)
-	# --disable-debug enables debug!
-	use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "To start the bug detection service on an openrc-based system, do"
-	elog "# /etc/init.d/abrt start"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
deleted file mode 100644
index e2723067cb6e..000000000000
--- a/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 00704d4eb30dd12d6f4fcf97320c354ed3eacfa7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 22 Sep 2012 05:50:38 -0400
-Subject: [PATCH] Fix automake-1.12 autoreconf issues
-
-Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am and
-':='-style assignments and $(wildcard *~) in src/hooks/Makefile.am.
-
-Need AM_PROG_CC_C_O for src/applet/applet.c
-
-gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
-problems for automake-1.12.
----
- configure.ac           | 8 +++-----
- src/daemon/Makefile.am | 2 +-
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a78d9f8..42acccf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_INIT([abrt],
- 	[crash-catcher@fedorahosted.org])
- 
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
- # Support silent build rules. Disable by either passing --disable-silent-rules
- # to ./configure or passing V=1 to make
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-@@ -12,8 +12,9 @@ AM_SILENT_RULES([yes])
- 
- 
- AC_DISABLE_STATIC
-+AM_PROG_AR
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_PROG_LN_S
- 
- AC_SYS_LARGEFILE
-@@ -30,9 +31,6 @@ GETTEXT_PACKAGE=abrt
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
- 
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.17])
--
- IT_PROG_INTLTOOL([0.35.0])
- 
- dnl ****** END ****************************************
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index 777dfc4..5a5f0ea 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -63,4 +63,4 @@ EXTRA_DIST = abrt-handle-upload
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
- install-data-local:
--	$(mkdir_p) '$(DESTDIR)/$(VAR_RUN)'
-+	$(MKDIR_P) '$(DESTDIR)/$(VAR_RUN)'
--- 
-1.7.12
-
diff --git a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
deleted file mode 100644
index e15731bbf04c..000000000000
--- a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 3ddf2f38a47c7cc13dd6f480841b9b90f6304ed4 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Mon, 3 Sep 2012 19:01:24 +0200
-Subject: [PATCH] abrt-gui: fall back to direct access if dbus access fails.
- Closes #484
-
-It looks like this:
-
-root> abrt-gui
-Can't connect to system DBus: Error connecting: No such file or directory
-Error in DBus communication, falling back to direct access to '/var/spool/abrt'
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- src/gui-gtk/main.c    | 44 +++++++++++++++++++++++++++-----------------
- src/lib/problem_api.c |  5 +++--
- 2 files changed, 30 insertions(+), 19 deletions(-)
-
-diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
-index 2cc4bef..e6e8ef0 100644
---- a/src/gui-gtk/main.c
-+++ b/src/gui-gtk/main.c
-@@ -252,23 +252,6 @@ static void add_directory_to_dirlist(const char *problem_dir_path, gpointer data
-     VERB1 log("added: %s", problem_dir_path);
- }
- 
--static void query_dbus_and_add_to_dirlist(void)
--{
--    GList *problem_dirs = get_problems_over_dbus(g_authorize);
--
--    if (problem_dirs)
--    {
--        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
--        list_free_with_free(problem_dirs);
--    }
--
--    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
--     * live in g_settings_dump_location.
--     * Notifications on changes should be implemented to go over dbus too.
--     */
--    watch_this_dir(g_settings_dump_location);
--}
--
- static void scan_directory_and_add_to_dirlist(const char *path)
- {
-     DIR *dp = opendir(path);
-@@ -296,6 +279,33 @@ static void scan_directory_and_add_to_dirlist(const char *path)
-     watch_this_dir(path);
- }
- 
-+static void query_dbus_and_add_to_dirlist(void)
-+{
-+    GList *problem_dirs = get_problems_over_dbus(g_authorize);
-+
-+    if (problem_dirs == ERR_PTR)
-+    {
-+        /* One way to trigger this is to temporarily rename
-+         * dbus socket (/var/run/dbus/system_bus_socket)
-+         */
-+        error_msg("Error in DBus communication, falling back to direct access to '%s'", g_settings_dump_location);
-+        scan_directory_and_add_to_dirlist(g_settings_dump_location);
-+        return;
-+    }
-+
-+    if (problem_dirs)
-+    {
-+        g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
-+        list_free_with_free(problem_dirs);
-+    }
-+
-+    /* HACK ALERT! We "magically know" that dbus-reported problem dirs
-+     * live in g_settings_dump_location.
-+     * Notifications on changes should be implemented to go over dbus too.
-+     */
-+    watch_this_dir(g_settings_dump_location);
-+}
-+
- static void scan_dirs_and_add_to_dirlist(void)
- {
-     if (!(g_opts & OPT_D))
-diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c
-index b9967e8..04f4069 100644
---- a/src/lib/problem_api.c
-+++ b/src/lib/problem_api.c
-@@ -144,7 +144,7 @@ GList *get_problems_over_dbus(bool authorize)
- {
-     GDBusProxy *proxy = get_dbus_proxy();
-     if (!proxy)
--        return NULL;
-+        return ERR_PTR;
- 
-     GError *error = NULL;
-     GVariant *result = g_dbus_proxy_call_sync(proxy,
-@@ -159,6 +159,7 @@ GList *get_problems_over_dbus(bool authorize)
-     {
-         error_msg(_("Can't get problem list from abrt-dbus: %s"), error->message);
-         g_error_free(error);
-+        return ERR_PTR;
-     }
- 
-     GList *list = NULL;
-@@ -172,4 +173,4 @@ GList *get_problems_over_dbus(bool authorize)
-     }
- 
-     return list;
--}
-\ No newline at end of file
-+}
--- 
-1.7.12
-
diff --git a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
deleted file mode 100644
index 0aa4267910e6..000000000000
--- a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From 1f56956ade3bd28ef192fba675e798db58b3ae40 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 22 Sep 2012 05:45:28 -0400
-Subject: [PATCH] Disable code not relevant for Gentoo
-
-Disable code that is only relevant for an RPM-based distro or that
-requires additional bugs.gentoo.org infrastructure support. Ensure that
-crashes still get analyzed even if they cannot be assigned to any
-package (since we lack any way of doing that at the moment).
----
- configure.ac                        |  1 -
- doc/Makefile.am                     |  2 --
- src/daemon/Makefile.am              | 18 ----------
- src/daemon/abrt_event.conf          | 14 +++++---
- src/plugins/Makefile.am             | 71 +------------------------------------
- src/plugins/abrt-action-list-dsos   | 18 +++-------
- src/plugins/ccpp_event.conf         | 29 +--------------
- src/plugins/ccpp_retrace_event.conf |  8 +----
- src/plugins/koops_event.conf        | 15 --------
- src/plugins/python_event.conf       | 16 ---------
- src/plugins/xorg_event.conf         |  2 +-
- 11 files changed, 17 insertions(+), 177 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bb2b986..a78d9f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,7 +79,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
- PKG_CHECK_MODULES([DBUS], [dbus-1])
- PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
--PKG_CHECK_MODULES([RPM], [rpm])
- PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
- PKG_CHECK_MODULES([NSS], [nss])
- PKG_CHECK_MODULES([BTPARSER], [btparser])
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 0a829d4..33cc8e6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -16,11 +16,9 @@ MAN1_TXT += abrt-cli.txt
- MAN1_TXT += abrt-action-save-package-data.txt
- MAN1_TXT += abrt-install-ccpp-hook.txt
- MAN1_TXT += abrt-action-analyze-vmcore.txt
--MAN1_TXT += abrt-bodhi.txt
- 
- MAN5_TXT =
- MAN5_TXT += abrt.conf.txt
--MAN5_TXT += abrt-action-save-package-data.conf.txt
- 
- MAN8_TXT =
- MAN8_TXT += abrtd.txt abrt-dbus.txt
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index 2e24403..777dfc4 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -6,9 +6,6 @@ dist_eventsconf_DATA = \
- bin_SCRIPTS = \
-     abrt-handle-upload
- 
--bin_PROGRAMS = \
--    abrt-action-save-package-data
--
- sbin_PROGRAMS = \
-     abrtd \
-     abrt-server
-@@ -55,21 +52,6 @@ abrt_handle_event_LDADD = \
-     $(LIBREPORT_LIBS) \
-     $(BTPARSER_LIBS)
- 
--abrt_action_save_package_data_SOURCES = \
--    rpm.h rpm.c \
--    abrt-action-save-package-data.c
--abrt_action_save_package_data_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    -DCONF_DIR=\"$(CONF_DIR)\" \
--    $(GLIB_CFLAGS) \
--    $(LIBREPORT_CFLAGS) \
--    -D_GNU_SOURCE
--abrt_action_save_package_data_LDADD = \
--    $(RPM_LIBS) \
--    $(LIBREPORT_LIBS) \
--    ../lib/libabrt.la
--
- daemonconfdir = $(CONF_DIR)
- dist_daemonconf_DATA = \
-     abrt.conf \
-diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
-index a1411e4..aab7dc0 100644
---- a/src/daemon/abrt_event.conf
-+++ b/src/daemon/abrt_event.conf
-@@ -44,7 +44,7 @@
- 
- 
- # Determine in which package/component the crash happened (if not yet done):
--EVENT=post-create component= remote!=1
-+#EVENT=post-create component= remote!=1
-         abrt-action-save-package-data
- 
- 
-@@ -60,19 +60,19 @@ EVENT=post-create
-         if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
- 
- 
--EVENT=notify package!= uid!=
-+EVENT=notify uid!=
- 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
- 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
- 
--EVENT=notify package!= uid=
-+EVENT=notify uid=
- 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
- 	string:"`cat package`" string:"$DUMP_DIR"
- 
--EVENT=notify-dup package!= uid!=
-+EVENT=notify-dup uid!=
- 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
- 	string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
- 
--EVENT=notify-dup package!= uid=
-+EVENT=notify-dup uid=
- 	dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
- 	string:"`cat package`" string:"$DUMP_DIR"
- 
-@@ -108,6 +108,10 @@ EVENT=notify-dup package!= uid=
- #EVENT=post-create
-         reporter-upload -u scp://user:password@server.name/var/spool/abrt-upload || :
- 
-+#report-gui event is used for reporting by abrt-applet and abrt-gui
-+
-+EVENT=report-gui analyzer=CCpp
-+        report-gtk -e analyze_LocalGDB -e report_Logger -- "$DUMP_DIR"
- 
- #open-gui event is used by abrt-gui's "Edit"->"Open problem data"
- 
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 10ab579..f0248b1 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -1,7 +1,6 @@
- -include ../../config.mak
- 
- bin_SCRIPTS = \
--    abrt-action-install-debuginfo \
-     abrt-action-analyze-core \
-     abrt-action-analyze-vmcore \
-     abrt-action-list-dsos
-@@ -16,12 +15,7 @@ bin_PROGRAMS = \
-     abrt-action-trim-files \
-     abrt-action-generate-backtrace \
-     abrt-action-generate-core-backtrace \
--    abrt-action-analyze-backtrace \
--    abrt-retrace-client \
--    abrt-dedup-client \
--    abrt-bodhi
--
--libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
-+    abrt-action-analyze-backtrace
- 
- #dist_pluginsconf_DATA = Python.conf
- 
-@@ -44,7 +38,6 @@ eventsconfdir = $(EVENTS_CONF_DIR)
- 
- dist_eventsconf_DATA = \
-     ccpp_event.conf \
--    ccpp_retrace_event.conf \
-     koops_event.conf \
-     xorg_event.conf \
-     vmcore_event.conf \
-@@ -56,7 +49,6 @@ dist_eventsconf_DATA = \
- 
- 
- PYTHON_FILES = \
--    abrt-action-install-debuginfo.in \
-     abrt-action-list-dsos \
-     abrt-action-analyze-core \
-     abrt-action-analyze-vmcore.in
-@@ -69,7 +61,6 @@ EXTRA_DIST = \
-     collect_vimrc_user.xml.in \
-     collect_vimrc_system.xml.in \
-     analyze_LocalGDB.xml.in \
--    analyze_RetraceServer.xml.in \
-     analyze_VMcore.xml.in \
-     abrt-action-analyze-vmcore \
-     https-utils.h \
-@@ -204,64 +195,4 @@ abrt_action_analyze_backtrace_LDADD = \
-     $(LIBREPORT_LIBS) \
-     $(BTPARSER_LIBS)
- 
--abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \
--    abrt-action-install-debuginfo-to-abrt-cache.c
--abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    -D_GNU_SOURCE \
--    $(LIBREPORT_CFLAGS) \
--    -Wall -Wwrite-strings
--abrt_action_install_debuginfo_to_abrt_cache_LDADD = \
--     $(LIBREPORT_LIBS) \
--     ../lib/libabrt.la
--
--abrt_retrace_client_SOURCES = \
--    abrt-retrace-client.c \
--    https-utils.c
-- abrt_retrace_client_CFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--     $(NSS_CFLAGS) \
--     $(GLIB_CFLAGS) \
--     -D_GNU_SOURCE \
--     $(LIBREPORT_CFLAGS)
-- abrt_retrace_client_LDADD = \
--     $(LIBREPORT_LIBS) \
--     $(BTPARSER_LIBS) \
--     $(NSS_LIBS)
--
--abrt_dedup_client_SOURCES = \
--    abrt-dedup-client.c \
--    https-utils.c
-- abrt_dedup_client_CFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--     $(NSS_CFLAGS) \
--     $(GLIB_CFLAGS) \
--     -D_GNU_SOURCE \
--     $(LIBREPORT_CFLAGS)
-- abrt_dedup_client_LDADD = \
--     $(LIBREPORT_LIBS) \
--     $(BTPARSER_LIBS) \
--     $(NSS_LIBS)
--
--abrt_bodhi_SOURCES = \
--    bodhi.c
-- abrt_bodhi_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    $(GLIB_CFLAGS) \
--    $(LIBREPORT_CFLAGS) \
--    $(LIBREPORT_WEB_CFLAGS) \
--    $(JSON_C_CFLAGS) \
--    $(RPM_CFLAGS) \
--    -D_GNU_SOURCE
-- abrt_bodhi_LDADD = \
--    $(JSON_C_LIBS) \
--    $(RPM_LIBS) \
--    $(LIBREPORT_LIBS) \
--    $(LIBREPORT_WEB_LIBS)
--
--
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
-index 81a9927..bf1491c 100644
---- a/src/plugins/abrt-action-list-dsos
-+++ b/src/plugins/abrt-action-list-dsos
-@@ -5,7 +5,6 @@
- import sys
- import os
- import getopt
--import rpm
- 
- def log(s):
-     sys.stderr.write("%s\n" % s)
-@@ -68,19 +67,10 @@ if __name__ == "__main__":
-         try:
-             dso_paths = parse_maps(memfile)
-             for path in dso_paths:
--                ts = rpm.TransactionSet()
--                mi = ts.dbMatch('basenames', path)
--                if len(mi):
--                    for h in mi:
--                        if outname:
--                            outfile = xopen(outname, "w")
--                            outname = None
--                        outfile.write("%s %s (%s) %s\n" %
--                                    (path,
--                                     h[rpm.RPMTAG_NEVRA],
--                                     h[rpm.RPMTAG_VENDOR],
--                                     h[rpm.RPMTAG_INSTALLTIME])
--                                    )
-+                if outname:
-+                    outfile = xopen(outname, "w")
-+                    outname = None
-+                outfile.write(path)
- 
-         except Exception, ex:
-             error_msg_and_die("Can't get the DSO list: %s" % ex)
-diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
-index 81b14d2..cda0b7d 100644
---- a/src/plugins/ccpp_event.conf
-+++ b/src/plugins/ccpp_event.conf
-@@ -31,31 +31,4 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.*
- # or was this ability lost with move to python installer?
- EVENT=analyze_LocalGDB analyzer=CCpp
-         abrt-action-analyze-core --core=coredump -o build_ids &&
--        /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 &&
--        abrt-action-generate-backtrace &&
--        abrt-action-analyze-backtrace &&
--        (
--            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
--            if test -n "$bug_id"; then
--                abrt-bodhi -r -b $bug_id
--            fi
--        )
--
--
--# Bugzilla requires nonempty duphash
--EVENT=report_Bugzilla analyzer=CCpp duphash!=
--        abrt-dedup-client
--        test -f component || abrt-action-save-package-data
--        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
--
--# Send micro report
--EVENT=report_uReport analyzer=CCpp
--        reporter-ureport
--
--# update ABRT database after successful report to bugzilla
--EVENT=post_report analyzer=CCpp
--        reporter-ureport -r
--
--# Reporting of C/Cpp problems
--EVENT=report-gui analyzer=CCpp
--        report-gtk -e report_uReport -e analyze_RetraceServer -e report_Bugzilla -e post_report -- "$DUMP_DIR"
-+        abrt-action-generate-backtrace
-diff --git a/src/plugins/ccpp_retrace_event.conf b/src/plugins/ccpp_retrace_event.conf
-index 60e53d7..893502f 100644
---- a/src/plugins/ccpp_retrace_event.conf
-+++ b/src/plugins/ccpp_retrace_event.conf
-@@ -1,9 +1,3 @@
- EVENT=analyze_RetraceServer analyzer=CCpp
-         abrt-retrace-client batch --dir "$DUMP_DIR" --status-delay 10 &&
--        abrt-action-analyze-backtrace &&
--        (
--            bug_id=$(reporter-bugzilla -h `cat duphash`) &&
--            if test -n "$bug_id"; then
--                abrt-bodhi -r -b $bug_id
--            fi
--        )
-+        abrt-action-analyze-backtrace
-diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf
-index 91759b1..41708df 100644
---- a/src/plugins/koops_event.conf
-+++ b/src/plugins/koops_event.conf
-@@ -14,18 +14,3 @@ EVENT=post-create analyzer=Kerneloops
- # report
- #EVENT=report_Kerneloops analyzer=Kerneloops
-         reporter-kerneloops
--
--EVENT=report_Bugzilla analyzer=Kerneloops
--        reporter-bugzilla -b
--
--# Send micro report
--EVENT=report_uReport analyzer=Kerneloops
--        reporter-ureport
--
--# update ABRT database after successful report to bugzilla
--EVENT=post_report analyzer=Kerneloops
--        reporter-ureport -r
--
--# Reporting of kernel oopses
--EVENT=report-gui analyzer=Kerneloops
--        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
-diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
-index e60df11..66b41f2 100644
---- a/src/plugins/python_event.conf
-+++ b/src/plugins/python_event.conf
-@@ -1,19 +1,3 @@
- EVENT=post-create analyzer=Python
-         abrt-action-analyze-python
-         abrt-action-generate-core-backtrace
--
--EVENT=report_Bugzilla analyzer=Python
--        test -f component || abrt-action-save-package-data
--        reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
--
--# Send micro report
--EVENT=report_uReport analyzer=Python
--        reporter-ureport
--
--# update ABRT database after successful report to bugzilla
--EVENT=post_report analyzer=Python
--        reporter-ureport -r
--
--# Reporting of python exceptions
--EVENT=report-gui analyzer=Python
--        report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
-diff --git a/src/plugins/xorg_event.conf b/src/plugins/xorg_event.conf
-index b974a6b..5476230 100644
---- a/src/plugins/xorg_event.conf
-+++ b/src/plugins/xorg_event.conf
-@@ -33,4 +33,4 @@ EVENT=report_Bugzilla analyzer=xorg
- 
- # Reporting of xorg problems
- EVENT=report-gui analyzer=xorg
--    report-gtk -e report_Bugzilla -- "$DUMP_DIR"
-+    report-gtk -e report_Logger -- "$DUMP_DIR"
--- 
-1.7.12
-
diff --git a/app-admin/abrt/files/abrt-2.0.6-format-security.patch b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
deleted file mode 100644
index 6b5c8d0e3721..000000000000
--- a/app-admin/abrt/files/abrt-2.0.6-format-security.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0d7954713541df4612ab5b54b2808aae9a3d6f0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 16 Nov 2011 00:41:10 -0500
-Subject: [PATCH] Don't use server response as a format string
-
-It's bad practice even for trusted servers, and makes gcc complain about
-format-security.
----
- src/plugins/abrt-retrace-client.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
-index 0fb17a3..4c30334 100644
---- a/src/plugins/abrt-retrace-client.c
-+++ b/src/plugins/abrt-retrace-client.c
-@@ -958,7 +958,7 @@ static int create(bool delete_temp_archive,
-     if (response_code == 500 || response_code == 507)
-     {
-         alert_server_error();
--        error_msg_and_die(http_body);
-+        error_msg_and_die("%s", http_body);
-     }
-     else if (response_code == 403)
-     {
--- 
-1.7.8.rc1
-
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 98bd7290cd0b..0f31967794c7 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,16 +1,16 @@
 DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
-DIST ansible-2.6.12.tar.gz 10726648 BLAKE2B 9f3b1b48069f5b450f649bf1c21ee57922ac3db6a8b1b11c459b572bf298813490f230400f09d35d4d7b21a709643ac37cb527719fea59a1b57616b476235dcb SHA512 daee0a5c37a83dfd22b1fccb5245735e4874f7428f5e8f0244a8a208c7f73729bffc06df16d16e257ae65b8d4cafeb4e3b67e49160b5d9d530666166b5096a70
 DIST ansible-2.6.13.tar.gz 10730575 BLAKE2B 2442925421996731be59db7ca18994f9c158f0b1247554bc8252d76d6c8fe8574e4ec2e62d71d7de075a9b109c43620232c78d91dcb3aa8d574752862de4d156 SHA512 7592214bc5c0c4283c99d7a422d44a54f424afe848b40fa2c0b0a4b556361a6290b459d8bdb575ec323e4e96bbad7abc939cdb5664839bb13f5de3d054ffb880
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
-DIST ansible-2.7.6.tar.gz 11796062 BLAKE2B 171dbcc7380ded52b03b9b109705008a492dbc5b8542fa600562c66abb8c3d3ace6bc92696559357d62fec106938e8fa4366b67cd621e4e8144fad59d0870db7 SHA512 db0813009b4683b74bf4dda640adc3dad750e053c3a87f97c6e61a2a5ea7668ea51e97ec204ddcdba6f09733bb399f824f87f365b74c35315b979603c99a6b70
+DIST ansible-2.6.15.tar.gz 10734433 BLAKE2B 9c48d9de348a11a57b364921af26154b5a2106d0bfa2d7d341c06e2408b3f71d30b3cc2f5e4df1bb21eb6eebd39a4d297ce8d697d68826378d4e786a4acb4e25 SHA512 14951db33ed2124b3379adf1114a9c980f63668c18a79d436658d8ddc1bbbd38f26682520319bd0e399d6ced518ece0f01da5a6991003e8b30adf78f20c6d1e8
 DIST ansible-2.7.7.tar.gz 11809560 BLAKE2B 3960e4dcd166fb77ddcb6bbae03b20fe679b76aee3db118ddd4642ab7b837a66929bd4ec76c071c53eba7ece47aaf8a52ceb34ea092d3e3db8355839575b684c SHA512 41e007ccc5b22eaa1a7aa9c16f8d012268cbd1055b5c10a204134b7707ab7bf205aab04efccda9fb5497034896542d29ba253ad4ea09b4755b665bada22b4c54
 DIST ansible-2.7.8.tar.gz 11812884 BLAKE2B 867ed7072efc4effafd637ac0353bd722269046cae8ddb794eea8c6cf9d739bc567f2a5323a589c21a74bbb57565ef153fb8c52798c17809a42400abe72ce65c SHA512 f3501ce8b642f83fe3d5e21cdfa26bce8611e92bc6e68e40b3a7ff2443c7d8ee0b2175981c92a5e83f9ce8c5d7d75aac95106a237bb9325c66319d96a790009a
+DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
 EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
-EBUILD ansible-2.6.12.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
-EBUILD ansible-2.6.13.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
+EBUILD ansible-2.6.13.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.14.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
-EBUILD ansible-2.7.6.ebuild 1628 BLAKE2B b64016e802f967ca82cd90cbbf01a78b27ad44491bfaff47c8268fd959d072131f12771caf7a2fd386ea87ac46ecf3161acd0aaaedd2067322309b822128d6bc SHA512 90f07c63159f015e507340951b8a1de5d959b99654c5380b63b71dcd819e79e24713fd8a2b61ca4b6eb59bb3f8146ae0df5acf78ffaec39bf4786097110e8f72
-EBUILD ansible-2.7.7.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-2.6.15.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
+EBUILD ansible-2.7.7.ebuild 1628 BLAKE2B b64016e802f967ca82cd90cbbf01a78b27ad44491bfaff47c8268fd959d072131f12771caf7a2fd386ea87ac46ecf3161acd0aaaedd2067322309b822128d6bc SHA512 90f07c63159f015e507340951b8a1de5d959b99654c5380b63b71dcd819e79e24713fd8a2b61ca4b6eb59bb3f8146ae0df5acf78ffaec39bf4786097110e8f72
 EBUILD ansible-2.7.8.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-2.7.9.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
 EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.6.13.ebuild b/app-admin/ansible/ansible-2.6.13.ebuild
index 4bec3453ac7f..90340deaacc1 100644
--- a/app-admin/ansible/ansible-2.6.13.ebuild
+++ b/app-admin/ansible/ansible-2.6.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.12.ebuild b/app-admin/ansible/ansible-2.6.15.ebuild
index 90340deaacc1..4bec3453ac7f 100644
--- a/app-admin/ansible/ansible-2.6.12.ebuild
+++ b/app-admin/ansible/ansible-2.6.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.7.ebuild b/app-admin/ansible/ansible-2.7.7.ebuild
index 1363dee05e63..be1e38fe59f9 100644
--- a/app-admin/ansible/ansible-2.7.7.ebuild
+++ b/app-admin/ansible/ansible-2.7.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.6.ebuild b/app-admin/ansible/ansible-2.7.9.ebuild
index be1e38fe59f9..1363dee05e63 100644
--- a/app-admin/ansible/ansible-2.7.6.ebuild
+++ b/app-admin/ansible/ansible-2.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/chrootuid/Manifest b/app-admin/chrootuid/Manifest
index e4d6d13a02f6..9095abadc452 100644
--- a/app-admin/chrootuid/Manifest
+++ b/app-admin/chrootuid/Manifest
@@ -1,4 +1,3 @@
 DIST chrootuid1.3.tar.gz 5439 BLAKE2B 315be66360f8d81b77169cdac28171399492657d7a377bcf688c17cf82ed16b4042ead9dbf8e4c6149895c727f74fb4185bec867a93a14fea2c272cc1c7296ca SHA512 55ccc60e6010910466e700f9d0f2f666bc16ab72af3fbc1115916b4e005684d9ad28bc0b8b1cba3804ca68384c3b0fbe137114623eba70241eb8653325382a1f
-EBUILD chrootuid-1.3-r1.ebuild 623 BLAKE2B 6d059bf8b265c728dd13fdba0f890d06a69224f414f5b1774a1de2bb60d693b42489fdc4eb6af7e8028d3079901a698683ca19cc1772c369cc02c615701457ce SHA512 a31cc38602064d125b9ef6060d9a1d9ea15728501b4a36ed45b2e282d4be159e3632df1d6fa3747e5596321ee753de7864d3732b51e25628ba3040b21e29d76f
 EBUILD chrootuid-1.3-r2.ebuild 618 BLAKE2B 666638c5bf5031c59536aa2b9f968fcd3c8a45ed5d3719bba4262d0173a2935dd92904c8a241903b9ef538edc34ec0c04859d916a4ee94a752449fbd4b6bef33 SHA512 fb240d1ab4dd43ec48b7a91a1b8b7cf068e49b899ecab32f6290688f8176034f818cd5ad87379caef72fd816afb40362bc873922468a2daca42078ad7543ef5f
 MISC metadata.xml 222 BLAKE2B 49e8d7211eae902342acdd0ded674ae77affa878ee3ad2d1928f8988373fed091b4ab792823d739af897d5703bd67e36e19bb3c8295787123930b3b0aaf1fbda SHA512 a92bf1c4f983f2c7c834060538f86818a43cd13c06fda425d628a50b3f890fa3e6c36640a449df57af495ac39c3baf3560a4555cacd32c71f3dde533a992556a
diff --git a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
deleted file mode 100644
index 4c7913e04081..000000000000
--- a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-MY_P="${P/-/}"
-
-DESCRIPTION="Run a network service at low privilege level and restricted file system access"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin chrootuid
-	doman chrootuid.1
-	dodoc README chrootuid_license
-}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 87ec39c0ee40..ffb5941ec6b7 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,8 +1,7 @@
-AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
 AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
+AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6
 EBUILD conky-1.10.8-r4.ebuild 4721 BLAKE2B d9c89dffa7d58e01261168329bf3ff262b0fea01d319b7e00da36d9a912198ca197e8895dd1e267fdd33e650cd52ac0857ccd7e0e30c79ebeb38fed05f181c1b SHA512 8d938d25188f1d16b088ec5b248ace639e52f23380a11ce725bb20ecf4417ab650f5699510d6229beb48c699763ab0ba9fc43cb9cfdb6c7b4081be3fa9ef6dbc
-EBUILD conky-1.10.8-r5.ebuild 4723 BLAKE2B f8cec52cb3d048a9ee66e3a73a938697fa6e15309d1a6e3750e95978c4d47e5574c384089e703688ebafbb86b6e20c855893be67db834de2ee63862c07451b9b SHA512 c94c6cc8f40c9e4ea59ad14b11a41a1c95d2ed817774ea6ccf2e72979b16d12ec5c570dc95de8fec98ad00fbd10e1e569aedc82806f38ecdea8208cf914dc98e
-MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55
+EBUILD conky-1.10.8-r8.ebuild 4772 BLAKE2B b8b7eb6a6dc3e381890663337613fa334d301bbf5192ad4d42b6f6fcdcd80971f6453f444f70e6da354cb745567a78f92d320de5deb87745e1e2b0ed9087d5f7 SHA512 c7771bf49e134d9a50c94df85f136814aa96507117812c99b05effa86d28be800479c04f5f6a4659f73ec03b374de7bae0ed1a12c216b3c5fcf7841153d1b023
+MISC metadata.xml 2337 BLAKE2B 9715a8cad30dca01712abb068bbd8d211319f63e95495af63f948bf124d899c1b14e68a1a5caf3811f5183405607767fe0011f5d3309f4aaaff21a7b0e1d1b5c SHA512 7fe1ca85064422cfcec6af1009317fe6c70c6d1b1bbee775691e4e8056c540ae16625764866b63d4a2abe94d70105a43410c37e623f3e53bf3c8a8582cc768df
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
deleted file mode 100644
index 2abe62d83a00..000000000000
--- a/app-admin/conky/conky-1.10.8-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar weather-xoap webserver wifi X xmms2"
-
-DEPEND_COMMON="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? (
-			>=dev-lua/toluapp-1.0.93
-			x11-libs/cairo[X] )
-		lua-imlib? (
-			>=dev-lua/toluapp-1.0.93
-			media-libs/imlib2[X] )
-		lua-rsvg? (
-			>=dev-lua/toluapp-1.0.93
-			gnome-base/librsvg )
-		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
-		xmms2? ( media-sound/xmms2 )
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical )
-	iconv? ( virtual/libiconv )
-	irc? ( net-libs/libircclient )
-	mysql? ( >=virtual/mysql-5.0 )
-	ncurses? ( sys-libs/ncurses:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	>=dev-lang/lua-5.1.4-r8:0
-	"
-RDEPEND="
-	${DEPEND_COMMON}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-DEPEND="
-	${DEPEND_COMMON}
-	app-text/docbook2X
-	"
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT%/}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
-		cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_X11=ON
-			-DOWN_WINDOW=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XFT=$(usex truetype)
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_AUDACIOUS=$(usex audacious)
-			-DBUILD_XMMS2=$(usex xmms2)
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_AUDACIOUS=OFF
-			-DBUILD_XMMS2=OFF
-		)
-	fi
-
-	if use weather-xoap; then
-		mycmakeargs+=(
-			-DBUILD_WEATHER_XOAP=ON
-			-DBUILD_WEATHER_METAR=ON
-		)
-	elif use weather-metar; then
-		mycmakeargs+=(
-			-DBUILD_WEATHER_METAR=ON
-			-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_WEATHER_XOAP=OFF
-			-DBUILD_WEATHER_METAR=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=OFF
-		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=ON
-		-DRELEASE=ON
-		-DBUILD_BMPX=OFF
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/conky/conky-1.10.8-r5.ebuild b/app-admin/conky/conky-1.10.8-r8.ebuild
index aded0ff23a49..e44e22636d24 100644
--- a/app-admin/conky/conky-1.10.8-r5.ebuild
+++ b/app-admin/conky/conky-1.10.8-r8.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	cmus? ( media-sound/cmus )
 	curl? ( net-misc/curl )
 	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical )
+	ical? ( dev-libs/libical:= )
 	iconv? ( virtual/libiconv )
 	irc? ( net-libs/libircclient )
 	mysql? ( dev-db/mysql-connector-c )
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 	wifi? ( net-wireless/wireless-tools )
 	weather-metar? ( net-misc/curl )
 	webserver? ( net-libs/libmicrohttpd )
-	>=dev-lang/lua-5.1.4-r8:0
+	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -68,6 +68,7 @@ DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 PATCHES=(
 	"${FILESDIR}"/${P}-use-pkgconfig.patch
 	"${FILESDIR}"/${P}-libical-3.patch
+	"${FILESDIR}"/${P}-portmon.patch
 )
 
 DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
deleted file mode 100644
index eb113a47fd57..000000000000
--- a/app-admin/conky/files/conky-1.10.4-x11-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
-From: shizeeg <shizeeque@gmail.com>
-Date: Thu, 8 Sep 2016 18:24:29 +0300
-Subject: [PATCH] Fix build without X11 (#317)
-
----
- src/conky.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 0a812fc..4c5da94 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
- 
- int draw_each_line_inner(char *s, int special_index, int last_special_applied)
- {
-+#ifndef BUILD_X11
-+	static int cur_x, cur_y;	/* current x and y for drawing */
-+#endif
- #ifdef BUILD_X11
- 	int font_h = 0;
- 	int cur_y_add = 0;
-@@ -1934,6 +1937,7 @@ static void draw_text(void)
- 
- static void draw_stuff(void)
- {
-+	static int text_offset_x, text_offset_y; /* offset for start position */
- 	text_offset_x = text_offset_y = 0;
- #ifdef BUILD_IMLIB2
- 	cimlib_render(text_start_x, text_start_y, window.width, window.height);
diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
new file mode 100644
index 000000000000..e7b17dd1119a
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-portmon.patch
@@ -0,0 +1,20 @@
+--- conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:26.315879386 +0100
++++ conky-1.10.8/src/CMakeLists.txt	2019-03-09 08:24:38.555878656 +0100
+@@ -220,6 +220,15 @@
+ install(TARGETS
+ 	conky
+ 	RUNTIME DESTINATION bin
+-	LIBRARY DESTINATION lib
+-	ARCHIVE DESTINATION lib
++	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ )
++
++if(BUILD_PORT_MONITORS)
++	install(TARGETS
++	tcp-portmon
++	RUNTIME DESTINATION bin
++	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
++)
++endif(BUILD_PORT_MONITORS)
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index d15fcbe31d0d..c06ab79fa44a 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -16,7 +16,6 @@
 	<longdescription>Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.</longdescription>
 	<use>
 		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
-		<flag name="audacious">Enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
 		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
 		<flag name="eve">Enable support for the eve-online skill monitor</flag>
 		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
@@ -33,7 +32,6 @@
 		<flag name="portmon">Enable support for tcp (ip4) port monitoring</flag>
 		<flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag>
 		<flag name="weather-metar">Enable support for metar weather service</flag>
-		<flag name="weather-xoap">Enable support for metar and xoap weather service</flag>
 		<flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
 		<flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
 	</use>
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index ee5901f90d69..e630c1c2776c 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,9 +1,14 @@
 AUX conserver-8.1.18-dmalloc.patch 2806 BLAKE2B 0ce6a09d90c82a455bb706f755e8485df1d8aec4f7a8cb534ac97d584ccb94715c68568d46496a3a298cd258a5e68219ce3f37cc33a6239d3b533636b53d85bf SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6
+AUX conserver-8.2.2-ssl-compat.patch 1113 BLAKE2B 93d336f18493b26b77b5855a432071d6a6cd9c32e5029f4fa5135010b8ffa1b4aafb4ab4c7ed38b93318a2682a5300a64ea3ecbfb9fa4f0bd1354899ce4903a0 SHA512 a93dfb89ace14590588ce6c72f5af90a253e98d61d83acf1c38aa43978877d072d6b9e7a7d49d590f010c59a6540e15fa3d70833a0d5499461767e956ad649a0
+AUX conserver-8.2.2-time-argument.patch 754 BLAKE2B 364385cf118601449682dc5c8ac4ac872e9bc2b9d3195164500f70c3fd50f58318eb22b4df8985cfaf58931bc0a84cee7795ab63061cc63969f9a5cde40a76e4 SHA512 06cb6208e3bfb394289f8298e1778fd77882e16c368df137b0bb3593b0326cd1bde5507989e7bf7cddb436a47a16ddfc1bbb64552f767d2a1460411baca55e40
 AUX conserver-prestrip.patch 882 BLAKE2B b5a327827a6a56ead78821e9fa091cabba0b914d94a8cb273b6fc5003e927948483d7a32ad858a7c94f7c7422f1a124fd42b65544b198bea317cd2caf68c96ac SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af
 AUX conserver.confd 170 BLAKE2B f6bc04796726454fec2c24207d3342c72c1789db5aeb39e47928e12d12300a16cec51f82e9447bf4546f732e3f9184724936450a852392671d4725fa3df99985 SHA512 af326d215eb7b6e4bdf68a9fc8b58c42dae9d0b31f653af181097c7cf4ee663bcc7c848f77ef051327e54a18e0202536b524b1b82d36693751f07d2c37f5b071
-AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73bf7a1405a242801f145fe788935a63212a8990135cae3537369ee36c39503d859a96c90d1fec678215 SHA512 4bd10a1cd95707d6ebde6774ed88ef69552ed1b823baac4942958f9ecc2c5185f45d08d9a4707ad31320645c80e13a34b5fecbfb6eac9f282c2c422820986ac6
-AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
+AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad173070e89fd1ce613b34147ad547c621b6aa98165bfb13ef67f0886667ab52973cfe4f45ea13c1f07a7bf SHA512 34fbe44a28a1a56ce51f9f2cebfc0d1bd20e4c4ea153f7605fb96434001b6bc9c52ba7e770617ed36710bfb7f69cebe7d79b31efbccac6c6a8847cf12a1ed774
+AUX conserver.initd 1085 BLAKE2B c3eef5736137d3bf48c8f0b6d135c458fa9e0ebf0dd8254677cc6dc3d313bc2b239229167bec01534aa1f62384f0b3cc7ae7522ddcb0e5651f2a3d660ff4b352 SHA512 22ea8fad24acfd602e135d586880dd3b63c4cfa6da40c20b85b0f9ba591eab7192dbaaf3526b56ef038a95017b7bf810b1e1c4259b4e6cfd8eca4966a8432c12
+AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B ed919fd5d042acb254861e7caa29becfa4637bf9077a791d5828e5c873f4479ce398ef8da72316d4059f63ae3c2b75550e78c8f778b8a20fbb1924bd5f033fff SHA512 ffbadfef4f779a87d0e6631be8e9bdad909176076713502d053f4acd538358281a20bdd94ea74d45d4311b3ae5e580114ea13114cff8a6835e488a03b620143b
-MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1
+DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
+EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
+EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
+MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 0ab9102d365a..53a8cd7fd301 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -62,7 +62,7 @@ src_install() {
 	fperms 700 /var/consoles
 
 	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newinitd "${FILESDIR}"/conserver.initd conserver
 	newconfd "${FILESDIR}"/conserver.confd conserver
 
 	dodir /etc/conserver
diff --git a/app-admin/conserver/conserver-8.2.2.ebuild b/app-admin/conserver/conserver-8.2.2.ebuild
new file mode 100644
index 000000000000..ceb5c721f569
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam ssl-cert
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+
+DEPEND="debug? ( dev-libs/dmalloc:= )
+	freeipmi? ( sys-libs/freeipmi:= )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+	pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
+
+PATCHES=(
+	"${FILESDIR}/${P}-time-argument.patch"
+	"${FILESDIR}/${P}-ssl-compat.patch"
+)
+
+src_prepare() {
+	default
+	sed -e '/^INSTALL_PROGRAM/s:-s::' \
+		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with debug dmalloc)
+		$(use_with ipv6)
+		$(use_with freeipmi)
+		$(use_with kerberos gssapi)
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with tcpd libwrap)
+		--with-cffile=conserver/conserver.cf
+		--with-logfile=/var/log/conserver.log
+		--with-master=localhost
+		--with-pidfile=/run/conserver.pid
+		--with-port=7782
+		--with-pwdfile=conserver/conserver.passwd
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	keepdir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	einstalldocs
+	docinto examples
+	dodoc -r conserver.cf/samples/.
+
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+src_test() {
+	# hangs without -j1
+	emake -j1 test
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
+			install_cert /etc/ssl/conserver/conserver
+		fi
+	fi
+}
diff --git a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
new file mode 100644
index 000000000000..f3054a9a0dac
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
@@ -0,0 +1,40 @@
+diff --git a/configure.in b/configure.in
+index a060811..00b7f8b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -535,7 +535,7 @@ AC_ARG_WITH(openssl,
+ 	    [LIBS="$LIBS -lssl -lcrypto"
+ 	    AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
+ 	    AC_TRY_LINK([#include <openssl/ssl.h>
+-		],[SSL_library_init()],
++		],[SSL_CTX_new(NULL)],
+ 		[AC_MSG_RESULT(yes)
+ 		cons_with_openssl="YES"
+ 		AC_DEFINE(HAVE_OPENSSL)
+diff --git a/conserver/cutil.c b/conserver/cutil.c
+index af8196c..dcfe333 100644
+--- a/conserver/cutil.c
++++ b/conserver/cutil.c
+@@ -57,7 +57,9 @@ Bye(int status)
+ {
+     DestroyDataStructures();
+ #if HAVE_OPENSSL
++# if OPENSSL_VERSION_NUMBER < 0x10100000L
+     ERR_free_strings();
++# endif
+ #endif
+     exit(status);
+ }
+diff --git a/conserver/cutil.h b/conserver/cutil.h
+index 899da7a..63aef65 100644
+--- a/conserver/cutil.h
++++ b/conserver/cutil.h
+@@ -7,6 +7,8 @@
+ #include <stdarg.h>
+ #if HAVE_OPENSSL
+ # include <openssl/ssl.h>
++# include <openssl/bn.h>
++# include <openssl/dh.h>
+ # include <openssl/err.h>
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TLS_method SSLv23_method
diff --git a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
new file mode 100644
index 000000000000..0a42987135b1
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
@@ -0,0 +1,22 @@
+From 3d9d5509c90524256861dd7cf0b7c0c6fdf5424a Mon Sep 17 00:00:00 2001
+From: Ed Maste <emaste@freebsd.org>
+Date: Wed, 10 Oct 2018 12:56:26 -0400
+Subject: [PATCH] Correct argument type passed to time()
+
+---
+ conserver/readcfg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conserver/readcfg.c b/conserver/readcfg.c
+index 949b9bf..d5bb90a 100644
+--- a/conserver/readcfg.c
++++ b/conserver/readcfg.c
+@@ -3116,7 +3116,7 @@ ConsoleAdd(CONSENT *c)
+ 	pCEmatch->logfilemax = c->logfilemax;
+ 	if (pCEmatch->logfilemax != (off_t) 0 &&
+ 	    timers[T_ROLL] == (time_t)0)
+-	    timers[T_ROLL] = time((time_t)0);
++	    timers[T_ROLL] = time((time_t *)0);
+ 
+ 	SwapStr(&pCEmatch->motd, &c->motd);
+ 	SwapStr(&pCEmatch->idlestring, &c->idlestring);
diff --git a/app-admin/conserver/files/conserver.confd-r1 b/app-admin/conserver/files/conserver.confd-r1
new file mode 100644
index 000000000000..119ceb060063
--- /dev/null
+++ b/app-admin/conserver/files/conserver.confd-r1
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/conserver
+# check CONSERVER(8) for details
+
+#CONSERVER_LOG="/var/log/conserver.log"
+#CONSERVER_OPTS=""
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
index 0c0771c72c6b..841892672cc2 100644
--- a/app-admin/conserver/files/conserver.initd
+++ b/app-admin/conserver/files/conserver.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -25,7 +25,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --exec \
+	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
 		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
 	eend $? "Failed to start conserver"
 }
diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1
index 907b1b711705..839aae6825df 100644
--- a/app-admin/conserver/files/conserver.initd-r1
+++ b/app-admin/conserver/files/conserver.initd-r1
@@ -1,37 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need clock
+	need clock localmount
+	use net
 }
 
-checkconfig() {
-	if [ ! -e /etc/conserver/conserver.cf ] ; then
-		eerror "You need to create /etc/conserver/conserver.cf first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-
-	if [ ! -e /etc/conserver/conserver.passwd ] ; then
-		eerror "You need to create /etc/conserver/conserver.passwd first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
-		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
-	eend $? "Failed to start conserver"
-}
-
-stop() {
-	ebegin "Stopping conserver"
-	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
-	eend $? "Failed to stop conserver"
-}
+command="/usr/sbin/conserver"
+command_args="-d -L ${CONSERVER_LOG:-/var/log/${RC_SVCNAME}.log} ${CONSERVER_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="/etc/conserver/${RC_SVCNAME}.cf /etc/conserver/${RC_SVCNAME}.passwd"
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index 06b3d82363fe..3b1ff77779ce 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dan@danweeks.net</email>
 		<name>Dan Weeks</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -22,4 +26,7 @@
 		that, assuming you have a network connection, you can interact with any
 		of the equipment from home or wherever.
 	</longdescription>
+	<use>
+		<flag name="freeipmi">Compile in FreeIPMI support via sys-libs/freeipmi</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 74059a79660e..04de4d0e2c4c 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,8 +1,6 @@
-DIST eclean-kernel-0.4.2.tar.bz2 9666 BLAKE2B 5c3dea084a39a0b84d4d99b43c397b6bd910700e6f9939c4618e7bf697d1984be1a4627e9cc8036ec296c0e1c24c0fb2b7232c6c5fbc11bf2c72a96891acb615 SHA512 6a69cfd54ee72a13a3a1a6ca460d73377170ef7731d3598b7cb1fc6263c95cd64dfbe0f260d1a8739d7c032e431523493a1fc8032bd92d1a537e672eb7436dec
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.2.ebuild 484 BLAKE2B ab77f514ef70df8880aaaffe878a5133f9a4aea61fca095144b039d5fee27d61d3de1d0d61d81c2d55b1ac597cc5320dd75da9a9170b84e901bb6764776e67ad SHA512 c08956426b48fee7e5332d73384e7f89c9df2c3d705b0d770249e4de73342f7b6d3cde3837d87ea28eab2645fb506ecd6208fadb56777ab38379604e339efbd2
-EBUILD eclean-kernel-0.4.3.ebuild 500 BLAKE2B f3fdaa391fd587b66bf1f2963d1aec23dc48e38c1d731eee32d7400af7ad322638555cce81a225f58e35b8716169196fcd402f062b31981d8b0f07fc2d9d8db8 SHA512 3578f90f04ee9e844a84b711ef47618df35657424a905897a6c2b8ed0ab27239b3d6ed6901fcc29b399d7cc31980266e081555f173673f6070ae164acf6578ba
+EBUILD eclean-kernel-0.4.3.ebuild 498 BLAKE2B a2425d0f701327ab32ef5722685730af9f2fd38ac44a2be96ca2861afcbaa24499ddefefb0fb288f35acb4564787b9dd642b2db7a3836c77e8634a023380d599 SHA512 6b72f4a9e85374d8c4659b603153a611c271baade6c83ea59508383c13f3ee4b64f308da88761af0b6e7e60d19eb3657c118f6829b155677c6a51c54279d54e8
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
deleted file mode 100644
index 499b37919ec2..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index c1901d1d4cce..790981581118 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 3b5a316a32d1..3d13ac63ba2e 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -5,8 +5,10 @@ DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc
 DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
 DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
 DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
+DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
 EBUILD filebeat-5.6.13.ebuild 1595 BLAKE2B ab657b0be80c86c637aa30fb32a2011aec931c43ce4a839f0040dd749321ff8bc0a67c249bc64356736cc8afc18dd9b25df2fca51bfdb6ba176c0af5cabea39f SHA512 801f38077f15698eafe43ed6138d014108ce0bb9178de2fd166874ed0f21e56da415f2f476e1b0b00929c359a286847742a732a2dc001700c4994cf9f92f91b8
 EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
 EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
 EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
+EBUILD filebeat-6.6.1.ebuild 1477 BLAKE2B e77d50b39c421fcd161d066248e4af864f8c9e414ac36d9c043ee40372ee0c7e84f2e72d45d00a7252877f1910cf5db11dec88a5e0ed7008c7600ce9826c358f SHA512 ba38e1a89475555f7941a566b717ccf26d27694914615fd4c1d3b8916a1b6d20bf395412bd1a25d8a6f62d06a301a36325acbfb32b0b37dc0270b55e31bec284
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.6.1.ebuild b/app-admin/filebeat/filebeat-6.6.1.ebuild
new file mode 100644
index 000000000000..31ffac470420
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.11.2"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index ce411fcf95ba..487ea9d2b31e 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -7,8 +7,10 @@ DIST fluentd-1.2.6.gem 434176 BLAKE2B 05fb0a29def48b673f458a19eb2662b0e447d94928
 DIST fluentd-1.3.1.gem 437760 BLAKE2B 59afdadc2d67e30d35df2f33c169e9f2cbfd44ac6b7497b025fd9229921f91ac37ce8b6f80f37df26a03e5062ce2f5187156a70302ca11f9a7d9db9cfccebf9c SHA512 84351148809332c9a703243416004f18d0470cafc04cf63de7c52d9b6da18f1c6f2de0682ff1d5283f28013707fcfe24cbcf67aebc3be91090c4d5cca80ec2cc
 DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c07c254ec5ed1012f8ebd98323cfbd671d5e9f940025d049c67b6dedd4f0feb9a079291e83f465e107e105d3 SHA512 8357ae88ed028778f6c7ae3dca051b32840bcf8cd344292e1fd3d203dae85e32d8263dea72d657010d803bb36d78d27a8441a8a7edf49439609041acac39f967
 DIST fluentd-1.3.3.gem 438784 BLAKE2B 186aa4af59707c6a68a6f82b94b233e3f52eb11745ff4ce7f942a4fb1f8516cc966e14f541a23dfdfda72ddea058e19d1b8184d0c40bf92ce4cd48e5735946a9 SHA512 b3348939d72b07d424a8d98f0d817e72d55918be9ac4ef5f456a3c44ac1ca28944b63c943bf2bb230b58793a33c1ca12304cebed15827a3f6e32f2ae3b68f0dd
+DIST fluentd-1.4.0.gem 440832 BLAKE2B 8f25cc6ca4ceb164156fe3ff3a14a18109f0943587cc5cad49185ee442e3cf381fa6859e36c8df94241f8a9922102fd479e39b08c394c46d6edc7bcf58abecee SHA512 e817cc128a29e5c30c40e08985f84d3a8e713cdcfd0e05af7d08d3b7dd5cb6810b85c455a3c425bd84775cdc060e74530dd264bf5fe354b5038c3a2d779d42c6
 EBUILD fluentd-1.2.6-r1.ebuild 1353 BLAKE2B da8e47f5f09abf639374137691b7329767e3bc0febbdb58299811456f168e9d6b3a8ab00758a2a1dd8654d0a60bb97b47842e249728d99ef1c9886a87759d7da SHA512 bc101637c4a80853b7b7403debb7d25069508020e75d1e3ca597f327e615bf60fe0793ebd8a437c3bc3734fe2556756589525959a40625fb979dc698ba3bc320
 EBUILD fluentd-1.3.1.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
+EBUILD fluentd-1.4.0.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/fluentd-1.4.0.ebuild b/app-admin/fluentd/fluentd-1.4.0.ebuild
new file mode 100644
index 000000000000..9bb8568d1ebc
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 021eb218b00f..74db5c3b08e0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,8 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
-DIST keepassxc-2.3.3-src.tar.xz 4113768 BLAKE2B 7c599471b775ff8612968596765d05f2862ae21adc0bb0d595b5366ce55354c156e1df3940549bb955dd9e6609cbebbae3f108ae3eb8ccb0e85c83e9183a60d8 SHA512 155dda3c81ecb3be4638c634fe2dd7f96a54076b371a1f6ab95c33319ff2a50eaf941a1415f42724444749a40d7fbcb3972604199f6a0445df4a22a4bac73c0b
+AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-EBUILD keepassxc-2.3.3.ebuild 1829 BLAKE2B db444246f4d9ab3c0bbf4600951e6219959cc70c311c9a1ac43afc4e1aa11702a6eaefb46c9ad76239c91828e757d529fc34c0550bb5d4a304f5073a6ffbe005 SHA512 667adad7d093e71f47b8c2f4d9a9ee08ac2649d3ebd0047d8e7d68cc20c2900230e77fab5953be26f7968765fc593233a2d3a6fc85b7cc15f2dd86de3155cfb2
-EBUILD keepassxc-2.3.4.ebuild 1838 BLAKE2B 1c2865fbb7a6b1a00567f43627d8435abd40ee7a2e79c06b2b9d85b93eba1047f1b3c3172ad6b0f981b25a15c43a5569eee85c1da32c1f9f245ec5e608ac8712 SHA512 78ac08e98a96bfcd7b8487dbe09fef9dcb6825ddf09575f0d9ee8e8b79ce5f4e8aebb5870ca009d49d73debaea50f6b10109595e2fcc12bc8f8d80168b7e5009
-EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
+DIST keepassxc-2.4.0_beta2.tar.gz 4740311 BLAKE2B 071edbf9d985671d70c381bd4863a704af6ad172a22fcf23ee0e12c8ea2a723029626669ed37e2e2739e3a66106b00b4c73cdbaa8e43496d950363422d6df8cc SHA512 5db8eb11a6aa42632bf2642af121063cb0df32fa1cda1beaea7c18e07c65049d3fa9a1a76643bd97ded80b7e5b2d403e9cd414c808faffdf2cb7e75c7f0578b1
+EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
+EBUILD keepassxc-2.4.0_beta2.ebuild 2034 BLAKE2B 490e10dc028abf7611b4b6d40a785883547d3c79bc6c7e4c12b228764f18fe6b1c3f6f5060318aad1f14a9b24f78dca6e7b3ebc37e0143697a404e3697b1b09a SHA512 200892601ad3c51c8b29aff2970dbc2e922e4a246e3e7176d2d5ef0ca52dc8fd650dc1809b666b31837081652f30e56493dc0087588bb42308659fa07956b1b2
+EBUILD keepassxc-9999.ebuild 1978 BLAKE2B 12c28125986700c0e190b07d689d48da7846d6106fb5866e49196902edb52d5fb94736bee4ce867994d3865fecbe6f5895359b0daf50337f719fb1cd9b08037d SHA512 6b05af40e41c9a73b99448a425071ec1bf013a3b1568b0ad744c16baddad15adb56e7fa243442200839d853d4b7762920b92f69c4cfcad95b7f63740d6b2dc4b
 MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779
diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
new file mode 100644
index 000000000000..a3ff5f7244d8
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
@@ -0,0 +1,25 @@
+From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 8 Mar 2019 14:48:13 +0100
+Subject: [PATCH] Don't call mandb
+
+There are other man implementations beside man-db so it is not even sure
+that the "mandb" binary even exists on all unices. Other than that, usually
+there's a cron job running "mandb" on a daily basis.
+---
+ src/cli/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index e59a911a..c3f97a2c 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -94,5 +94,4 @@ endif()
+ 
+ if(APPLE OR UNIX)
+     install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+-    execute_process(COMMAND mandb -q)
+ endif()
+-- 
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.3.4.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
index 623e428fb79d..742ca5d1e1b0 100644
--- a/app-admin/keepassxc/keepassxc-2.3.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -11,7 +11,7 @@ HOMEPAGE="https://keepassxc.org"
 if [[ "${PV}" != 9999 ]] ; then
 	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
@@ -47,8 +47,14 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 "
 
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844
+	"${FILESDIR}/${PN}-dont_call_mandb.patch"
 )
 
 src_prepare() {
@@ -72,14 +78,14 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
index 3b2a5255c887..4d05c7804c81 100644
--- a/app-admin/keepassxc/keepassxc-2.3.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
-	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="amd64 x86"
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+	fi
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
@@ -47,8 +52,13 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 "
 
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
 PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11-edit-entry-widget-includes.patch" #655844
+	"${FILESDIR}/${PN}-dont_call_mandb.patch"
 )
 
 src_prepare() {
@@ -69,17 +79,20 @@ src_configure() {
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 69a100508278..b59c1684db72 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
-	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+	fi
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
@@ -47,6 +52,11 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 "
 
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
@@ -65,17 +75,20 @@ src_configure() {
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 5a9959eaa1c6..15858944192a 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -7,15 +7,9 @@ AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e899003
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-5.6.13.tar.gz 104517136 BLAKE2B c4f0ba5f8e1624ef0493e553166a3c18aab9c4d73a661a5f91988627ec8470dc8a1b52461673e27169c8c10b33dfdeffeef96e70e1a8a04b7ee4a1e71a9afb68 SHA512 df12877b8d28ce9392f9d9ec9414205dd1f628a8e927c8b31f0ad3c3c7b11108509fe6b44119faa3f1bab393ea7be74a3a7c5b5b6b49d6ff5b54ce31fd024a04
-DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
-DIST logstash-6.4.3.tar.gz 153936585 BLAKE2B efdcc4664587a3ab18e2e78136c92bc643e99989fa5ac1cd1daaeb48ca1f6fa57f122a5686ddcaab59d920a0ef0e59dc70f59c05a520b731347f37d8faa78c38 SHA512 39bab1b9b0c9f0006c2ad7aa152b3863179030352202ec0c4c4a887bdeb98d4c34127699655cfc7c5b9f44119b45de9629bfacc670d520dcf266b3298fdf2484
-DIST logstash-6.5.4.tar.gz 160286824 BLAKE2B 6f76edee968566539670b0ffc5462a0a417d39dc8f7d3fab35704ace23c27503f7051a064fca2820d52b100a19818621841356f8e1df20a80c95902f4c1c7f95 SHA512 8dff51b3944219b462002d0ced4ae7050d8ab8f9335de1132be11ab8e7277731f319c5794601881ee94350152725c599093316c5ef55ddc95279697ec794cc57
-DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
-DIST logstash-oss-6.4.3.tar.gz 153809786 BLAKE2B 774e67b7f3b89747299fda520456164186e843dedbea4b6727fa325dc8148ea1b25fcb2105e76b84330729a55390e597fac93cf2e2f258e83f2b6cc1c1091372 SHA512 c84e4fcdbf8e96e5d3005186bdf45f20939bb065f02370128b4e15273c4c0fe5609bab606fc7a6a2b71fcee90beb3f435ff42c9126efaed436bf5af1d784c56a
-DIST logstash-oss-6.5.4.tar.gz 160157672 BLAKE2B 47a6de33697ccc04ba08cb15086cb17ead20a38c9348619ddcd383e61c20265864451939f5be10ec9ebd0ba9b0667264af389130f87181734b942efa49c7e705 SHA512 0b8384e48bc584236fa7369339843c9aa1d08fb09a80e209beabf8e029f2fb5a4a5a1a5ef8b91f069cb35472d3b8147752749a4f6a84c6fc5a2cc801ac8d3c91
-EBUILD logstash-bin-5.6.13.ebuild 2195 BLAKE2B df43d04421b3463a427cb2d1c6a1efce021ad8064d08a004535463c6d58f8b41d5dce3fdfe81f556b949151392d373a0685e24a0c0c65d2ee405c6ed834760e5 SHA512 8acbfce31e3484fbd9d9de4337f981bb7d720eb7fda7c200efed822a645c7b81318a4f8642dee620ffd50fd365eb9d70d754cebf666fdeba8a405a2b4f5d5ada
-EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
-EBUILD logstash-bin-6.4.3.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
-EBUILD logstash-bin-6.5.4.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
+DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
+DIST logstash-6.6.1.tar.gz 169642354 BLAKE2B 335fa036e9f120de5d6588ed18e927ddfb3a94dfcfbc9605fbda3e3eb4da3ba88561d466eb171c85a2deebb3328312ba903616704844e253a7599f75597efbae SHA512 a66f196f160af29492b64efb61b7e3253a4ef45764c5e6226f73c2a216151ff43f6d344c2e3340a1a9ddb8b00e61f14c65d5dd0c14d69421f4efa3542445fe4f
+DIST logstash-oss-6.6.1.tar.gz 169512439 BLAKE2B 54a18deda80079c9bf2de39936737689d696a4ddc6f8a7ae375d48817ea127f1eb83f1ef50a18b573709446fc3deb858f53a5aff6411329b52ef0316859a7f03 SHA512 7fbe960e615c3c6b6715bd63debd3db869abe29bfdc94d4947290b822fe1d858e289548dbda266c8ad6d25745e63a788de0c83566121faa0d3027642b0f3d108
+EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
+EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.13.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.15.ebuild
index 9692d38eba5b..635350ca2abb 100644
--- a/app-admin/logstash-bin/logstash-bin-5.6.13.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
deleted file mode 100644
index acbb17a3c74d..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
deleted file mode 100644
index 7cc0ca6f38b2..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.4.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
index 7cc0ca6f38b2..97dc32bb2def 100644
--- a/app-admin/logstash-bin/logstash-bin-6.4.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 76e7af96c425..cbb7a9dc8da4 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,11 +1,17 @@
 DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
+DIST mongo-tools-3.6.10.tar.gz 4731097 BLAKE2B dffd18bbcb5a1d869cd3a00b40be7c83d12c2146944044c8d873eba409b9fcb0ce0595c01cd61a6b0405dfce685b8dde7c285380150906d4d38d3de9b42962bf SHA512 3e9808c6b275566215f8c2ce033a6259d373e8b63db5e981cc28235d757404b3209a64dd9aa8a98d9290c5c1da137a1bf9bc48629b278cb27ca28be681e86efc
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
 DIST mongo-tools-3.6.9.tar.gz 4723117 BLAKE2B 2cc88b9e8424abe082d68a8f7afa02bf2b21d027cabe04298fafbd065346350d57f6a48ece1a849e779cac6da315aa9d5469c5f63ca5aae6be7e8f73fae3fe4b SHA512 def8e2bb68898c540dfa9fbe742696d463c099e7d70fc2f0e114301d321e3983ef0b07588301340b0a3ffdf2280febc3fa37e77d2520f147e723d2ce147c7261
 DIST mongo-tools-4.0.3.tar.gz 10874727 BLAKE2B 3e5d07b8ae797d0876b68a3018806e91a30758415aaa236423648a77f5e0d475848060516ee0da91a8448813a12a685410b93bf219b8180beb91f448e329a532 SHA512 cbe74b3fdebd0d4f6be6e3acf7f55f5f1a551b0ad1a23d82782643d2a9eb9ea4b7e0133985485b8c5a88c1fea26595e3ed9c759f1f63b578b6472d850154d67b
 DIST mongo-tools-4.0.4.tar.gz 10878921 BLAKE2B 3960838f68333bf033be9b72191e221b449bde8157ecb6d2f595d84c862fadd9597a53be88e5b0ad691cb6163cf90294348145ecce4c796c88bf84a4d7d8ab86 SHA512 d7900dbbd1e1e63d5518494c85559a7eab34f53ffa38880628f3dda0a71ee1211f67cf7dfaac66498b0359eca32abb9c89410e5cc56415a1594acf38ebfa226b
+DIST mongo-tools-4.0.5.tar.gz 10878974 BLAKE2B 704eadb7469d1f07bcf0c18fd2c3d1a2078064e8d0f33e03b0ec0a7539a8ae6e5c4ec3a4f9dff4f34d3cea8a2aa63097bfa050de0af5d0a44e54e4e47c83565f SHA512 5a2ca0cb761895a6c3187bdf4ac0c11222ac681313c2c22801571a1147e07b7b6149150b07e58cd4487413017da56424ec494eaaf9aec9193498ee3cde73c5da
+DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
 EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
+EBUILD mongo-tools-3.6.10.ebuild 1467 BLAKE2B d427b7a72aa69cd08b9794a44ef8aa67c6fc98ed6a5883f78b4ad20f859843fcf465ec9eaa140181dee2f46f802832deee4d29458ad1469b2b0170cdcaf43850 SHA512 80ad6309e28f61b00bbcb1965cf22054c189a2fdf69e25511518c0f64dea0b61df8c7750dc9bb525e0c2498f710dd42e241c5245ee0559ea675b7afd42c82530
 EBUILD mongo-tools-3.6.8.ebuild 1209 BLAKE2B b0001e50446b633ebc998662e3facf2b47417f8c2517ddd492dcba8def99c354a00a86b9e35a818202e75f42ee63761a3fc3623c61df60da1c4134261d9d9223 SHA512 93ce0059938aa8b052f9ccaa52573bd175e656bdb36f078838340b009b73dd96f3960eb468f295edda1e47c5e7fffe53933f98b2360b48a73137c97d70d51b5b
 EBUILD mongo-tools-3.6.9.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
 EBUILD mongo-tools-4.0.3.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
-EBUILD mongo-tools-4.0.4.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
+EBUILD mongo-tools-4.0.4.ebuild 1439 BLAKE2B 51aa9d75fbbfb9e98513f93f5568858a6592e0d239b95f5cb091674f99476607d7e17f0dd4abea4bfdc8f78ce7a5617ee225a16957f8697d86c6938f0c3ef38a SHA512 eca0f907343e5f43892d15a6017ec9dcd5e3a96978d6a7968d570bc8a83a78294c2bdacb92146e2faa254f2f464081d570d05275f9fe8980ace66d01f731d77b
+EBUILD mongo-tools-4.0.5.ebuild 1467 BLAKE2B d427b7a72aa69cd08b9794a44ef8aa67c6fc98ed6a5883f78b4ad20f859843fcf465ec9eaa140181dee2f46f802832deee4d29458ad1469b2b0170cdcaf43850 SHA512 80ad6309e28f61b00bbcb1965cf22054c189a2fdf69e25511518c0f64dea0b61df8c7750dc9bb525e0c2498f710dd42e241c5245ee0559ea675b7afd42c82530
+EBUILD mongo-tools-4.0.6.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
new file mode 100644
index 000000000000..5aacbbb10637
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="${PREFIX}/usr/$(get_libdir)/go" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.4.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.4.ebuild
index 5cf7cbaadac3..27f23784aa2d 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.4.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,9 @@ src_prepare() {
 	if ! use ppc64; then
 		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
 	fi
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/src/github.com/google/gopacket/pcap/pcap.go || die
 }
 
 src_compile() {
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.5.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.5.ebuild
new file mode 100644
index 000000000000..5aacbbb10637
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="${PREFIX}/usr/$(get_libdir)/go" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 6c74fd10c181..568385ceb166 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,10 +1,10 @@
 AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.23.0.tar.gz 1298472 BLAKE2B 8cc580c1a9947e43703eff3593992d6ad53380918ccab17e0294c195469953f2ae617b8f8360d16b77264012da0aba99dc072d7ff3e3fc66429b3b8f33adb098 SHA512 6ca3de51c7fdb8a677feafb684dc459f4064539fe5501dfa53a2027bb7b1e6f6121b7fa593c9e373f009d2fd0eeca2b9dd659c337f056dfe769908a3aa7ec5b8
 DIST monit-5.25.1.tar.gz 1353855 BLAKE2B 5abef9c97088b12ab376e67f2524534ad1b0e2e3dfa98d5f5fdd8a6fc2331ead57d77aa1d8229a0825cbb36871b063006b74dc98dd780baef8aaca1da5c6c74c SHA512 b21b18302aed602f9371f7dee29f7306dbccd355df333bc6d868acdb6c054cef877dee72e261383938fe1d10121cd07e820e040ea80ed70260fdda8b451f6ab1
 DIST monit-5.25.2.tar.gz 1354704 BLAKE2B 503660146edba988d0c52d1773dc3d3d6f495b3e3f0ae147be6a4297bf118ad6b5f7289868ad4b61226cf499bd8d6e3aed8f5fec91ff8ff699968f4262f1fd01 SHA512 e9b6ce60bf82c2564a084fc42b65ef432ee35855cad038fe6ae209047abaa1c54cabb4cd75c8a85c1102844a1b90c3c5f8ddbbd56711665b9bea616bcc02ec86
-EBUILD monit-5.23.0.ebuild 1101 BLAKE2B 8083ac591d7e3131e053c25a1b50ee6ddc90882bec2c706321c044922b6070b021dde5480c224dab4ef58afb55cc6d69f135e4b0aa3f15e8529e303cea66020d SHA512 c49e39d635cff50eb1708ed61741b6200ae22646889af29a29a01d90bb51ba19e9bc81bf0b731e100369e8201def512753ee35dd352137991a1c6eb2032a9ef3
+DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90
 EBUILD monit-5.25.1.ebuild 1101 BLAKE2B 8cb885879cb8ad000a9978091df84c2eba145d72b0838c12eed5f7de2891107e0973e8b07bdcc3ff20ddc8188072f65d1f9fc45444e3e124ed2f4adf533c3d83 SHA512 f80d2c48d1bfd011eb4ddd71e65af8d7148104d1607eb741afcca1bd66ff4604cffd32bbc045a1fee24bd64b5637ccaed6e3655275dd2a925d65319069d26753
 EBUILD monit-5.25.2-r1.ebuild 1226 BLAKE2B d1efe3c4501795e124ea3895fa21bfa2264d5bb5d153748b94efcccee38cfeb269cc5d769dcd792cf7167508bc0a23a05c36885cce0f9a99f729303be4b368e8 SHA512 7816aa95fcccdd7d27dd428cdc98f4f6a646aeef875dc02919503cbe1536b8dd2b8b473cd04236317c99f8fece3bb3aab30285424b5d4ea50c40153975584147
+EBUILD monit-5.25.3.ebuild 1203 BLAKE2B 424209d91e4e709e0e2e110d4d85d37ed0979f0ff4190c30955192b0454e881f66a54ea6e9a0b6eeaaf31abc7f7378a8ba5b1954d561c5d0ffa0d3ff0eedf802 SHA512 b67bb6c0c16aa686b249aa2da65a1d69c1f3635e03de4a72871fbc55b6f4ac5db7cca9165e27b5a7e5de4eeb51339bd5e1391bd9c7087f38151fabfdec7132de
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.23.0.ebuild b/app-admin/monit/monit-5.25.3.ebuild
index b3fe1c1e4950..6f690f325b5e 100644
--- a/app-admin/monit/monit-5.23.0.ebuild
+++ b/app-admin/monit/monit-5.25.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit pam systemd
+EAPI=7
+inherit bash-completion-r1 pam systemd
 
 DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
 HOMEPAGE="http://mmonit.com/monit/"
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="libressl pam ssl"
+IUSE="ipv6 libressl pam ssl"
 
 RDEPEND="
 	ssl? (
@@ -19,18 +19,24 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}
+	pam? ( virtual/pam )"
+BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
-	pam? ( virtual/pam )"
+"
 
 src_prepare() {
 	default
-
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
 }
 
 src_configure() {
-	econf $(use_with ssl) $(use_with pam)
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -43,6 +49,8 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 
 	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
 }
 
 pkg_postinst() {
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 1cb3a5ffaca1..88326328edb5 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,3 +1,4 @@
 DIST openrc-settingsd-1.0.1.tar.xz 243552 BLAKE2B 2abf084c59ef310ca72bf2d528c6f8f04b3a502ea421247989e5356e759f2850f1749ffae7592ff30c92a0496db01e9d5e55c2a4ae9dbd3a9954414d4eabd31b SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21
+EBUILD openrc-settingsd-1.0.1-r1.ebuild 1427 BLAKE2B 8b468392950009e0a693a8f0268404bb2555ef14cfd8f0f26ceead96c3bc4323dc7c05641329a7b4a38cc3e7d556397b6746eec154dc6569cdcf64291e098378 SHA512 4ba3e95ce2561a38ace8c91fd122c3b61aabdfbfae2f978645bcd67fbb55dfd246470f5cf8f85457d4d32f307c681de80469f9fafb0574aeea62fdc350d6f04d
 EBUILD openrc-settingsd-1.0.1.ebuild 1318 BLAKE2B b2c6e2d8e24600bc262a8560d88643e088a1136249e2de289d9f4cf184ec7ac24a89b36fda046803187babfbc22c9a7b4a1ec81c86d7d2d5973ead2369a37951 SHA512 8bd54bc1ff1f1adc6020224d58c72833c2f804f4d1f1d43f38664b52bc3e08fbf37c8c65517aea089f3acb4a5f1afa895aa60e61a8d6da26c19330e0f562b7b6
-MISC metadata.xml 488 BLAKE2B 9c5343c770ffe757e60a0137609ea51584caeaf250323c6df562f70b79560a9b895c49c7fcfe5270c29e10970059a0de5ba10ecdb7cdd9849e6e74b2f6ad03e2 SHA512 0e73f3f4231bebdf2c317d2737782e35e66cd08aead5b8192211857842d9c5d8ff62f6d0654940daccd444dc6884ecdcb2c4ffb0aa51bf999c09cacb3af1be15
+MISC metadata.xml 375 BLAKE2B 2ef1245cabf20154d53ca5b9161f9e5055d38ede47687bc2314cf787c804dbff40a1278769fec061468c95139a8c5f9f573e06e901c580e6923e93b29e3db398 SHA512 489eae3aa828d6aeb43f3b24783777644f7abd7522d842c44918ba6c5fecf0ca9f02f91764f7f2566960283737f4a2c17f307f4f26e9d1c8ff92ee9e2e99e8fc
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index fae0fa87a25c..aefee902e98a 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..ffe29605f1ff
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gitweb.gentoo.org/proj/openrc-settingsd.git"
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30:2
+	dev-libs/libdaemon:0=
+	sys-apps/dbus
+	sys-apps/openrc:=
+	sys-auth/polkit
+"
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die
+}
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"/usr/share/{dbus-1,polkit-1} "${ED}"/etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 69e80b8d7f86..7aea063d80c9 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,4 +1,3 @@
-AUX perl-cleaner-2.20-prefix.patch 4874 BLAKE2B cf598a2e1aa03959ac1f1a799daaf33ceb640e99652da386e4a15e58fd02a06d4462251a347431ca943dad2cd3945942d4a9d3e95bb9cd607bda61c1843018cc SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
diff --git a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
deleted file mode 100644
index 27d5b1dd73dd..000000000000
--- a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-add Prefix and Darwin support
-
---- perl-cleaner
-+++ perl-cleaner
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # vim: set et sw=4 sts=4 tw=80:
- # Copyright 2005-2014 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
-@@ -22,13 +22,13 @@
- PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs"
- PKGS_MANUAL=""
- 
--PKG_DBDIR=/var/db/pkg
-+PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
- 
- # See bug 504116 for details
--if [ -e /lib/gentoo/functions.sh ]; then
--    . /lib/gentoo/functions.sh
--elif [ -e /etc/init.d/functions.sh ]; then
--    . /etc/init.d/functions.sh
-+if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh"
-+elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
- else
-     echo "$0: Unable to find functions.sh"
-     exit 1
-@@ -157,7 +157,7 @@
- 
-     veinfo 1 "Locating ph files for removal"
-     eindent ""
--    for i in /usr/lib{,64,x32}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do
-         [[ ! -d ${i} ]] && continue
-         veinfo 4 "...in ${i}"
-         while IFS= read -r -d $'\0' file ; do
-@@ -183,13 +183,13 @@
-         veinfo 1 "Pretend. Nothing to do."
-         return
-     fi
--    pushd /usr/include > /dev/null
-+    pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null
-     if [[ ${version} =~ ^5.(8|10) ]] ; then
-         eindent
--        veinfo 2 "...in /usr/include"
-+        veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include"
-         h2ph ${option} * 2>/dev/null
-         for dir in sys arpa netinet bits security asm gnu linux ; do
--            veinfo 2 "...in /usr/include/$dir/"
-+            veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/"
-             h2ph ${option} -r $dir/*
-         done
-         eoutdent
-@@ -220,13 +220,16 @@
-         veinfo 1 "Locating ebuilds linked against libperl"
-     fi
- 
-+    local scanelf=scanelf
-+    [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \
-+        && scanelf=scanmacho
-     if ${LIBPERL} ; then
--        if ! type -P scanelf >/dev/null 2>&1; then
--            ewarn "scanelf not found! Install app-misc/pax-utils."
-+        if ! type -P ${scanelf} >/dev/null 2>&1; then
-+            ewarn "${scanelf} not found! Install app-misc/pax-utils."
-             ewarn "--libperl is disbled."
-             LIBPERL=false
-         else
--            SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')"
-+            SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')"
-             veinfo 4 SONAME="${SONAME}"
-         fi
-     fi
-@@ -268,7 +271,7 @@
-             while read -r type file ; do
-                 shopt -s extglob
-                 [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue
--                [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-+                [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-                 file=${file% +(!([[:space:]])) +([[:digit:]])}
-                 shopt -u extglob
-                 if ${FORCE} || outdated_path "${file}" ; then
-@@ -302,7 +305,7 @@
- 
-         if ${LIBPERL} ; then
-             # We assume the broken libs have all bin or lib in their path
--            broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )"
-+            broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )"
-             if [[ -n "${broken_libs}" ]] ; then
-                 if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then
-                     PKGS_TO_REMERGE+=" ${CATPKGVER}"
-@@ -327,7 +330,7 @@
-         exit $?
-     fi
- 
--    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then
-+    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then
-         # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS
-         emerge_default_opts=""
-         for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do
-@@ -383,7 +386,7 @@
-     veinfo 1 "or edited. This script cannot deal with them."
-     vecho 1
- 
--    for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do
-         [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )"
-     done
-     [[ ${#perlpath[*]} == 0 ]] && return
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
index 8d788cb118a1..7d7ae9949e04 100644
--- a/app-admin/pwcrypt/Manifest
+++ b/app-admin/pwcrypt/Manifest
@@ -1,4 +1,3 @@
 DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
-EBUILD pwcrypt-1.2.2-r1.ebuild 600 BLAKE2B 7ea7ff450ce343bfd8555478448c6cfa17d41b9563c60571d73836bb80fb72b8ad7c5c47696b12b18a0f185bb87a085f1e52b8d41dbf713649b5a2f5f6dafe26 SHA512 c25aec3737c58ce888455c64615cf478b4e4e868534ea0b5f4e060491c48a9789c6b9072295d98c9092301242513b737a7e200ee96c03145dd348ec0b8f98a37
 EBUILD pwcrypt-1.2.2-r2.ebuild 604 BLAKE2B 0c68ed9a4bbd8ae2ff627aae38ef052ccd2a42e28c8b59e6549ef548a746fb2447141d694a8ffb61634d9e853b4b88af0c351997fe1870b531128f526707a47c SHA512 495eb4e524da4ce8933ef2474383b36854978c4293fbe8d68cf69aa0c82b8e9c62d3f34ee948c5e15c163084514edbbb344811df1777e2ad5c212fcf137282cc
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
deleted file mode 100644
index bd467dcf45c8..000000000000
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
-HOMEPAGE="http://xjack.org/pwcrypt/"
-SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DOCS=( CREDITS README )
-
-src_prepare()  {
-	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
-	sed -i \
-		-e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
-		-e "/-install/s/ -s//" \
-		src/Makefile.in || die
-
-	tc-export CC
-}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index e9498df0f78b..eea7f3bbd836 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -3,5 +3,5 @@ AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d49
 DIST pwgen-2.07.tar.gz 53513 BLAKE2B c5d3a548ef1fab3b246b7ad9ffdc18d572136b3addd2a23e375e45d82af0f45f0e19e747d20d4e4cf7138f7121890460e82a85ffe17c451160c6c0f08bed4422 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
 EBUILD pwgen-2.07.ebuild 699 BLAKE2B e85ba0d3f6f4f432a2df5de6d8193c63cdf3a13ca6502ffc3378a9cfbf95c0d5ae5f195169ca7360ef531630fe9f913a28a768703ceea3cd2ab2fae4061ed934 SHA512 076cc779fff3df62668cce9fcfd58a98ce0f30fb535f1452f96233c96420f3893bb61f92d370cfded1dc49e2e32d89ba059a071db93d67d78d2ec12a65c13bc3
-EBUILD pwgen-2.08.ebuild 627 BLAKE2B f735419fcfa2c5234ff61d7155a481a94d26e2ed8ca80b014c2d2eb1ba19a656baf7e0d61e87e1810102bd7fc4b7e20d07ac0c03c4cdcec4d57655ca5dd9b59c SHA512 496b99be5baf7587ac5f0effaf6d39a040cb2cfc50b3a8a812e698aa3a559f6a96c3665fa877f5373d6fbc0488697e4e18ebfbffd4bbac91b1710f89033b8b38
+EBUILD pwgen-2.08.ebuild 618 BLAKE2B f1707c9b0c404db318965bbc1b683d68225b4c8afeaec4b2339dcbb9aeea6100d14d1806ffb7221271351b8adc55b9151c334d313efce4768212be4a2003c86c SHA512 cca54bba4b5674ee14751a9306b65965ba238a0cef36236ad25def1866688218a567819a450eea597cbedbcbbea1a30abb788d20a6c2f988ba0a271b7615a21f
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index e7712ee76083..0bf1696cdd67 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index ccc44f641465..e81cf09de746 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,7 +1,7 @@
 DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
 DIST restart-services-0.14.2.tgz 21227 BLAKE2B 9a3f03bbd1995df6f583f8c4228914f098922828b1407c0c8069908ebdbef67599a8a7421b0c404adf2d330632ae83646300a965c514f6746bbd95674ab102ea SHA512 487e8d0a448954be7b79d1c95bffd00d5f875ccb908b8004e18e45752e593fe57713f97c0749e28367bf7606c5cf46556f31de6b018a151f7cd384c88277ca7c
-DIST restart-services-0.14.3.tgz 21377 BLAKE2B f99331d66f174a68134722bf00b854d68f2b1deb492c6c6db0f17974dc14b28df1ce3a8669fe42a5085f64216e19003c02e364dcd1a75428060c9ef7ba176f86 SHA512 9c4b9d68db303548957b533edba58635a7bb97149f0cc2e1e270b399c860ff0b42a257a61d9c9b0d45c1704241d0cefda72e7411b9c29f9f80cf159b37908eb1
+DIST restart-services-0.14.4.tgz 21781 BLAKE2B 0d23ef098a3f15fdae23c9964f892e7095b04042dfed4c9da4d35fde8454d3f1fe5606c6e3e0141cb9e8d869f86df6b495ae985a0cf23d53a3a6d8eaa8964969 SHA512 89bd5edf5175694b3438788759f9b747251431ba700ad199f43b8fa551faa23411f33688e1aa6b04ae6524e737c4073926b989fa1422ddfca94514f9afd8de66
 EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
 EBUILD restart-services-0.14.2.ebuild 1769 BLAKE2B 8190b85be93b2c844bd832ace2bb962d09dfa4f8da8c930c2cc9bfe12516c62a0f3be0d403d74ac7471e635b92689a95b5dc46aa13cf99fcf49141a6faf3534e SHA512 18cdbd8f6f3b2c12df2e083fc86b927dea6e5ea1072c6ce716b9d7ef57973e8385bbac643ee66bd175f950dbc05109d8992b08ea04ced2367cff94948613b642
-EBUILD restart-services-0.14.3.ebuild 1766 BLAKE2B f82fa1a2985a1117cd0c30034273d25a77a0a22cae158c14eea457325c8d1a8c484cb1ddd924f220f2e8cfe676e2f977a1eccbdd1e4a7c30e410f6b988bedb9b SHA512 c59d1640a3694bc0e420a0db6fc7e4fcbb8133bbd517d8b36e84037f668feab5e10d4fb36c3bde3e949aa74bf09c6e7f841537a4dbeb2a86e4fd0687ab1317a7
+EBUILD restart-services-0.14.4.ebuild 1766 BLAKE2B f82fa1a2985a1117cd0c30034273d25a77a0a22cae158c14eea457325c8d1a8c484cb1ddd924f220f2e8cfe676e2f977a1eccbdd1e4a7c30e410f6b988bedb9b SHA512 c59d1640a3694bc0e420a0db6fc7e4fcbb8133bbd517d8b36e84037f668feab5e10d4fb36c3bde3e949aa74bf09c6e7f841537a4dbeb2a86e4fd0687ab1317a7
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.3.ebuild b/app-admin/restart-services/restart-services-0.14.4.ebuild
index 1e1571773610..1e1571773610 100644
--- a/app-admin/restart-services/restart-services-0.14.3.ebuild
+++ b/app-admin/restart-services/restart-services-0.14.4.ebuild
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 35b104a205c1..2d7c189f3963 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,7 +15,7 @@ DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87
 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
-EBUILD rsyslog-8.1901.0.ebuild 12426 BLAKE2B e16018bc7746c40b90a43cd504a9e22cff9c473ecb3ea39f1a19b9d2a35e7be90588c68b9dfcb2df6ddae5c67ffb38705890d99759f94a58f5350250f5f71b00 SHA512 365409268288d4ae50a2b10d22172da5e4f89eb4c16607ade2c6dc517103bf44e37f3dbb0ebb2ef2925d305108ec0112230ec306194f0e70986b43122e6887f0
+EBUILD rsyslog-8.1901.0.ebuild 12425 BLAKE2B 25fe698ba545032ec0c9c75b0ada6c7008b26e1899aa653cae923a66cd1763736b2e773f2f414f3ec1dd097cc187a8179caaffa0cf171aa7b6faed3f619a5534 SHA512 814e3dbfa4d3422370f7bdac9e6f2bf9cfeefac2f302d27517be6b44b6fdd0d6974deef3f888222d63706bb8982a0633f7e99e2eaba0f5ccf87e94389a8471bc
 EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
 EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
 EBUILD rsyslog-8.40.0-r1.ebuild 12407 BLAKE2B fb4b459cd731ccdce9ac784cb11a618c19a0bba94711d079e1ec9d846f459949603b2c93d74dd316a72a10e00ffea64dd5ceee216ed29c2f826d30e02909e9dc SHA512 22b89e3194f4bc2419f9aafbdaf1aea548747c80790b33feddcde09f06721538e41aaa3bf7c9b190841ebe780d82b48783dad467b40b05edf56d4d05675492aa
diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
index 493860c39f4a..7a95b8997577 100644
--- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 4137534a1bd7..57729a1a2ef0 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -34,6 +34,6 @@ DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55c
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
 EBUILD syslog-ng-3.17.2.ebuild 4922 BLAKE2B 560007f972492182a16701b89558923842ed5c1fa6c7e306abcc4dcc2b839b3b7404dd52214efdc5a1ac7fee0b280548e62b37b0d6a17ee0393f80aa5b0c7717 SHA512 bd08b6fff0e9022e846c7af360df41c2fbaf7d4342b0b7c099053e298b6588c535340c6b613bbc4dec0e9f7b8806b7dded125165cf0ca230733cd9e95b262599
 EBUILD syslog-ng-3.18.1.ebuild 4899 BLAKE2B d8820a1750256a9f5ee34ad3e7249a74cea84000ade2d3e1169106f336ffd3e3e1263db402350acc8693e88bf936aa13e5743ff1e1548cf744f40e2556625aa2 SHA512 3b5f475f9b596acecf905912c0d29b942d51a7d1ee3412adc1f46d658c5902bd7cb6504c6563c217e203fc9876e7253dbeefc8e5c8159c852c9a2fbad25c7d6d
-EBUILD syslog-ng-3.19.1.ebuild 4916 BLAKE2B d54094856176a1a09205379dd23e33671ef6d063162019e09af43cc638261b6df33372048202af36cc33a60c2a6a564b222923b501cc6d912f8a13082ff8192c SHA512 6114dc7ebd92c0dedac9ce63a1f0432df2e017180bb4fc0e5a88dda53d2566a86aefd53a4d61c5bc7664395c47772f3adbb69d0d4962fb634beba4c5fd04705b
+EBUILD syslog-ng-3.19.1.ebuild 4922 BLAKE2B e4f28cf97b9d63d341c632332e31020cd9bf035d05201defd12fb69b3b24a0fd14eb8db057a3d604e88dbb4b9105c78a9b99daa6d2ea80b2ab547bd909f7c1de SHA512 cf78ed7dd29b8b2a329b3146955690ba05f5b4f30f1747068f843485c9a937ddaf960132c5895ce2102c85bd5fbc46a25d8b181fc6116621aef5c03cfe3775c2
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
index 47dff24ce93a..417cb4bf7dde 100644
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index b0ac93fba95c..93424490787a 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,3 +1,3 @@
-DIST terraform-0.11.11.tar.gz 10938952 BLAKE2B 76062c2c95c95751f7a1a28fc7047ebd2255504dece99efa08ea8deede5e774a838571a2e0ab81fa90e2580823958d8e1781d154ecbed9c1d839a0cb2998487c SHA512 7c0cf4b0b70eab7dc88133d50ac4b586b72ac53e01c21c00766d03d10c753cfd404b146add21e378be8f1d305c5e92703cbaeac9e4c4b55bfc8b2532f74f63ee
-EBUILD terraform-0.11.11-r1.ebuild 852 BLAKE2B 14c3a52a8112435c7151853b3c00b9e698e99461ab14f8f56b1118773d5c3a9eb43e1ce2256c8af03d414a7844ee41d151412f5be9904e592981285d984716f9 SHA512 90359cc4f9ea782b3829b94ebd6620f3faa859160733b325789d1faf75b55ad40ed34c7c3ffe4c0670911b23fb2a0603a7d5591fff720e98229b5ab77d4aafc8
+DIST terraform-0.11.12.tar.gz 10907800 BLAKE2B d6d3c0a25b994be9b61e250a35adae55ed6cea0cc2166ea62774940292d9e881f16b66b88b19d5fd2c64d19bdefb82b58c79c54d8c641e1ad2970ef9a463c4c8 SHA512 2163cbc13a2bd37b7dace0a4ee2b3da4ee212038f9d6e11b83e509a794cf8d854040c366a099c9560a149157c6951b1f9d1698b4c47bd11a4fa96c4521e93414
+EBUILD terraform-0.11.12.ebuild 852 BLAKE2B 14c3a52a8112435c7151853b3c00b9e698e99461ab14f8f56b1118773d5c3a9eb43e1ce2256c8af03d414a7844ee41d151412f5be9904e592981285d984716f9 SHA512 90359cc4f9ea782b3829b94ebd6620f3faa859160733b325789d1faf75b55ad40ed34c7c3ffe4c0670911b23fb2a0603a7d5591fff720e98229b5ab77d4aafc8
 MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/terraform-0.11.11-r1.ebuild b/app-admin/terraform/terraform-0.11.12.ebuild
index 7fbea19820fc..7fbea19820fc 100644
--- a/app-admin/terraform/terraform-0.11.11-r1.ebuild
+++ b/app-admin/terraform/terraform-0.11.12.ebuild
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index ecd65e71f3f3..8a33e6e5e665 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,3 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
-DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
-EBUILD testdisk-7.1_pre20180322-r1.ebuild 2512 BLAKE2B cb68ae32f495fb7ff57c9dbbd3cb63d9c826cfb34e58cd053c32d6797b3632227ad71caf62ea7899bb292c48849a0f6ac5da339cea1242b488ab8485226ac790 SHA512 bf6ccce7c91035b45dda4dcc5f651d783600de40a4df78e8ee39f0f0543e8049ec90ec875dd4ced6cb760faa1f8a9eb80da5b23b352f01d208d49c686f3fcd79
 EBUILD testdisk-7.1_pre20180922.ebuild 2517 BLAKE2B 2335b1e92f1b9d90e0d3e0f4e0a4088fbd4e60b1a39c6eea0cb248a8f2c51e4b083a36404904ef24357002d2dafff914ee3014e1388db0154492f7be7ed9df85 SHA512 9b9f99e977056372bb89d49e35b44f06edbc6f18edff5e555b99cbc91183422ec965e8e0f396d4e03387c15c719a74c1774b8ef3a8ff2543664ed02349b92601
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
deleted file mode 100644
index b7dc995f76b3..000000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
-inherit autotools flag-o-matic gnome2-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-COMMON_DEPEND="
-	static? (
-		sys-apps/util-linux[static-libs]
-		sys-fs/e2fsprogs[static-libs]
-		sys-libs/ncurses:0[static-libs]
-		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g:=[static-libs] )
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-		zlib? ( sys-libs/zlib[static-libs] )
-		!arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
-	)
-	!static? (
-		sys-apps/util-linux
-		sys-fs/e2fsprogs
-		sys-libs/ncurses:0=
-		jpeg? ( virtual/jpeg:0 )
-		ntfs? ( sys-fs/ntfs3g )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-		zlib? ( sys-libs/zlib )
-		!arm? ( ewf? ( app-forensics/libewf:= ) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="!static? ( ${COMMON_DEPEND} )"
-
-DOCS=( )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 qt)
-		$(use_with reiserfs)
-		$(use_with zlib)
-	)
-
-	# this static method is the same used by upstream for their 'static' make
-	# target, but better, as it doesn't break.
-	use static && append-ldflags -static
-
-	econf "${myeconfargs[@]}"
-
-	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-		die "Failed to find either NTFS or NTFS-3G library."
-	fi
-	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-		die "Failed to find reiserfs library."
-	fi
-	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-		die "Failed to find jpeg library."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index b7b115114136..c7c6671db322 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -4,10 +4,8 @@ AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
 DIST vault-0.11.5.tar.gz 25459691 BLAKE2B 9f77e90b71629e1ed341d03830a0376b6731d85189dde0205148c7c8002556521538144cbf1b7bc425253cc55de6ab3d48cbcc1d270165e5804f7f632d06523b SHA512 b290523ee94199d241bbd2477ca686076f645804953181996aefe2a425bc5114db3d375fd5c832d1fa257a790947544406f50777317e854ccf2d4d4477ab6ffd
-DIST vault-1.0.1.tar.gz 25817507 BLAKE2B c4882341fbcea2051c8685dfff85739f11898d0406d12611cdda36f19d7badae69e88060d593ba03c333b151d4402b7bfc520f34c0663fe00a77998aa662f161 SHA512 b644e419faa8dc1f8a347f7b522ccafbdea9f849de9ad1ca085214d21e50bd2ec6eb868b4eb0abff65537abc4fba93c3e4ffd424afa90ca049068e6eccc99999
 DIST vault-1.0.2-webui.tar.xz 1252768 BLAKE2B d4af46bae84eb2e0e76633e5af061b351d486f19eebd0323a0ae5eb13275310e23169a88e3984a753ae45102c1010b54ae2ca789fe0c62e8e302305eec2bd129 SHA512 9282135e1f1cf983fb1ea4b72b7b3e5cc49aa42299aa5be40e9697da028c3e0bb8c2869e72a79b27ee2124a1b0f913b1b22ef98f96401289edb9e3407d460465
 DIST vault-1.0.2.tar.gz 25834864 BLAKE2B 88f3252547e05a70a377d7711c7df279619455ce26003868465df1030da9ffe95bddd094b40b99f7f4698bbacfd883cdee31d14ee47e815299eb41a18ef99b3d SHA512 e90a1db0401778650f16fa01827b274dc8e38e5f6fb420814bdc3f89507d3507a94d6bd3eacabf1ae782e72286dda598106918030b674f9b7d3f8e69cddbd3ec
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
-EBUILD vault-1.0.1.ebuild 1620 BLAKE2B 4cfe3ee73464ce3f1c53c9f1afc42022e8feef5312e678630b4e52abe2298baae67824f63b058341680c953713e94c715f9caa773312563588e2ec712eb7bef1 SHA512 9a1ff9ac7f1b15acda152467f7d9f041681f570eda71848c05c62643dc155c7fcacccd8dd3aac4bafe51ace6a9522cf847d5a47ce8fdef7677d8ff24cf605b82
-EBUILD vault-1.0.2.ebuild 2135 BLAKE2B 2372bc71e55bc372481dbe7c96031ffb05aacab25bdcc658e40f04b7562c15d1e507c8ea443b6ea935f174fe7a26742f6445a50da3e1f5004a6588d37028afa3 SHA512 5fbeb9aff965df2f8d441668805fb2d79e5b9c83fbd03d7faea5ea7a4a99cf14ecb51e48668f452b32ca4a45458009cd167af639499245abb770d6169c2af812
+EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.0.1.ebuild b/app-admin/vault/vault-1.0.1.ebuild
deleted file mode 100644
index 50b0e07331fb..000000000000
--- a/app-admin/vault/vault-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.0.2.ebuild b/app-admin/vault/vault-1.0.2.ebuild
index 8eb29218789b..dd41276fb783 100644
--- a/app-admin/vault/vault-1.0.2.ebuild
+++ b/app-admin/vault/vault-1.0.2.ebuild
@@ -56,6 +56,7 @@ pkg_setup() {
 
 src_compile() {
 	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
 	export GOBIN=${S}/bin GOPATH=${S}
 	cd src/${EGO_PN} || die
 	# The fmt target may need to be executed if it was previously
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
index b52050265a95..9498fc6c5bf0 100644
--- a/app-admin/yaala/Manifest
+++ b/app-admin/yaala/Manifest
@@ -1,5 +1,5 @@
 AUX yaala-0.7.3-r1-correct-paths.patch 1095 BLAKE2B 5c7a232836bd19ffa678db3c2d522f9d831535e3dc086e014fc45fe233ae9e20aa1a69359ccc2e913b1b2cd66ba29e053957ed32aabdb38948a57e55b485796e SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7
 DIST yaala-0.7.3.tar.bz2 41528 BLAKE2B 527f691730cd50f60137bce014958423bea4bf007891ac0a6fa0888099da7678661612369d29b41683de81a25bc92163f0d9f413e5a11e9f86c273e0e866ca8e SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01
 EBUILD yaala-0.7.3-r1.ebuild 1681 BLAKE2B 50fa29f2619f3b16d47d162ad2cd4ff89d035af12f5a58fe326855cff408ff4d2ac79dc1d400ef3dfccffe80ef71c588181655debc9f45cc49c87a13d290475c SHA512 babadaca079b88ab4a0f8c97b7dbacd36f716c3978fb81fdd8da3f0c441ed5bd05e03602d71f9dc4da2e4b7a4bdc2a3d397acd089d869627a9e6f44138841118
-EBUILD yaala-0.7.3-r2.ebuild 1624 BLAKE2B b57cb945dac02bbf0996e564ff02152e4dba219aca285240e5e37ecd872702c5ec26fcc0fd30ec854c870b4c966386ce1f64d430b69ffa3c64cecda12be1ef67 SHA512 1b637fdaa0b0bdc030e7153dc1c258ad881e81bcc9485e01313449381d999066274c9a1083c1188c686a8a4c99c6f51851921830ca1936fa118613ec7995cccf
+EBUILD yaala-0.7.3-r2.ebuild 1623 BLAKE2B 606c3b8b9e69c8b4e4d2887ebcc38ed3523bafd6e87bbe2d7ea52523fd02fecafc0da548dd7a8f0b62fa102e3d6e3d38f5f5cf2b3316fad6290ffbead848658a SHA512 63ccbeedf296fbbea7423dddf5ae04b38855dadb341b8483aae17df9932489fe0b940680c3a43861e8843e296e155817bfc46dd9837fa1317b240a6fd80a7eec
 MISC metadata.xml 337 BLAKE2B b1435fe71f760cc4fd4b6bceee0d4675b7f7e7b89986544003cfb7bbf59851b02025a8b0839d446efbde8c8240bcbba782d8f88c9e0db59b227de91dc885043a SHA512 a24db5faa68733175428ecdfc9c333e5209cfdbaee9e40a23af29d188068d5400d14d60c7239d890d7e66f640c4a2023cabf9b6d131d2abe58f0e90b221119c6
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
index 394594158940..e11eeb4dc61f 100644
--- a/app-admin/yaala/yaala-0.7.3-r2.ebuild
+++ b/app-admin/yaala/yaala-0.7.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gd"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /app-admin
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)