Sync with portage [Sun Mar 10 15:28:10 MSK 2019].

5 years ago · f596d95420
parent 4f7f15873a
commit f596d95420
3268 changed files with 6811 additions and 6812 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@ -1,3 +1,2 @@
-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
--- a/app-admin/abrt/abrt-2.0.12-r2.ebuild
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@ -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
-}
--- 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
@ -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
-
--- a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
+++ b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
@ -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
-
--- a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
+++ b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
@ -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
-
--- a/app-admin/abrt/files/abrt-2.0.6-format-security.patch
+++ b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
@ -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
-
--- a/app-admin/conky/conky-1.10.8-r8.ebuild
+++ b/app-admin/conky/conky-1.10.8-r8.ebuild
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ b/app-admin/conky/files/conky-1.10.8-portmon.patch
@ -6,15 +6,15 @@
 	RUNTIME DESTINATION bin
 -	LIBRARY DESTINATION lib
 -	ARCHIVE DESTINATION lib
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
+	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}/conky
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky
+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 +)
 +endif(BUILD_PORT_MONITORS)
--- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
@ -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}"
--- a/app-admin/monit/monit-5.25.3.ebuild
+++ b/app-admin/monit/monit-5.25.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="ipv6 libressl pam ssl"

 RDEPEND="
--- 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>
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@ -1,2 +1 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
-DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
--- a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
@ -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
-}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@ -1,2 +1,3 @@
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
 DIST advancecomp-2.1.tar.gz 1292135 BLAKE2B 0ad0586298c396f64dda1db3dd5865159b0897d5ee1485809531cad4e11fc9ab634f77c50e70065cf9d827fe4fad4a9d99a5e2587d0f3a8aaa55fe82dff008c1 SHA512 62abc585b282483bf5994491db3965463f4a54db642e489460d678f95faefc5d62f80bcd9e5a2a2ba3cd708d5cda7457a2b773be1a65385ef5528324e2d2949b
+DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="fcf71a89265c78fc26243574dda3a872574a5c02"
+DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
+HOMEPAGE="http://www.advancemame.it/comp-readme.html"
+SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz
+	-> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-arch/bzip2:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+# Tests seem to rely on exact output:
+# https://sourceforge.net/p/advancemame/bugs/270/
+RESTRICT="test"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-bzip2
+		# (--disable-* arguments are mishandled)
+		# --disable-debug
+		# --disable-valgrind
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc HISTORY
+}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdemu-daemon/metadata.xml
+++ b/app-cdr/cdemu-daemon/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="person">
    <email>mgorny@gentoo.org</email>
    <name>Michał Górny</name>
--- a/app-cdr/cdemu/metadata.xml
+++ b/app-cdr/cdemu/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="person">
    <email>mgorny@gentoo.org</email>
    <name>Michał Górny</name>
--- a/app-cdr/gcdemu/metadata.xml
+++ b/app-cdr/gcdemu/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="person">
    <email>mgorny@gentoo.org</email>
    <name>Michał Górny</name>
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@ -2,3 +2,4 @@ DIST debian-archive-keyring_2014.3_all.deb 40060 BLAKE2B 8cc046e484ec2f0f1028a36
 DIST debian-archive-keyring_2017.5_all.deb 56438 BLAKE2B 3dfe5e2fc1397eda72491b32eb1bc77a7b2f197a880fc5ca4a8aa79d54d6ecd3d080fca234ca5b418d96123af680ff2fe915af7b6050740f86a2d6f57f9a0fd7 SHA512 8e7dafd850a7ad0a322790e41ace819ad51c1a17be4bd506c5790ccef97f1a0dc0cb78841225b4c6a85c20d502800fbfe991ea9c8c48a5bb58598754dcbd6173
 DIST debian-archive-keyring_2017.6_all.deb 56618 BLAKE2B f16e0ad9e7a86b57e5011495747acecedd6901919a3b267bca3a41a3f0b212f8158a552c374d8e8a43a7260fec3c64d4634ee8c49ed2155fab9edd168d72505e SHA512 728252b029dc72ff341b5eaa1bcd1b7e0669c1e0f0cf120ad4cb5ec36e600ffb7d344e9b24d1daa964272f07c90e3ed70a1b7fb9b8507da0778a8370a4b18029
 DIST debian-archive-keyring_2017.7_all.deb 56940 BLAKE2B eac1f8399e6f3176721f4b6f8463849053f5dffaac0cd9d297e5774a62582a30caf9281614d71de6f302a15784082b99963eff910d253cdbeef26ad66337bdf2 SHA512 9802058a9de69d941eab9ebf7a8370b1b5af0130444ca8fd46996d1699f940775fec2820f7963fdcf70e49a467682d1ac023a1da72e34f90cf3c09a04dface74
+DIST debian-archive-keyring_2018.1_all.deb 57392 BLAKE2B 3262a1f49af9792ce378a0b6219287ac868d3483783218f55a0ab3d37b9fa0a857da2dcd4c83742d8b47ce4a2df5ecd985d2345d5367908f2f353e8cc0a6a5e3 SHA512 7bf98cda5b9639d68538a8d47e35d422e552bd8afa067e844f0e8e76a366f9d5e503e0f47dd646789fa0264a47b77d0bfcc22559ad09bdc95453e4a5c2169f0f
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2018.1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+}
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@ -1,6 +1,2 @@
-DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
-DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
-DIST gentoo-release.asc.20190223.gz 50407 BLAKE2B 6e3788da555fbb012c76ad174ddf6d0fd034c522b466b58c12e52eef5c900824724e32c51b53c7f7b542cca43073d1ab02ebcb7fc7560f0ff8c384cb47ee2fcc SHA512 3d71a91ae889ee1d237003f017d1cb7aec9129a9bcc9aa9cf2256656a88aaf96048c308994eda0b9f6b6fc2041fdb81cf91eb31d0b1ab7b380fe692b43e70d62
 DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-${PV}.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,5 +1 @@
-DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
-DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
-DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979 SHA512 eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
-DIST docker-compose-1.23.1.tar.gz 302224 BLAKE2B 510a6236194297dd68b3b1a00239142d0f5dd1cacb79a82604a22e7f57581f778ad6027d0108ff896e9f4354c5eb0e1fb2ceea4285bee6a47e5cb8e32a3e5a75 SHA512 d294663e575657c361602693d66aca1ae3c0f5d4b25a74f4ab575be34054dc3168cb77d59fedf981f6bc98e253e87791187440f10c6957254c4f2e29ef7063d0
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66 SHA512 baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
--- a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.7.0[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.21.2-r1.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.3.0[${PYTHON_USEDEP}]
-	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup-py.patch
-)
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.23.1-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.1-r1.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23.0-setup-py.patch
-)
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"

 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@ -32,7 +32,6 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	<dev-python/pyyaml-4
 	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	<dev-python/requests-2.21
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/six-2
 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
--- a/app-emulation/qemu/qemu-3.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0-r3.ebuild
@ -0,0 +1,815 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="2.11.1-r50"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+	# Gentoo specific patchsets:
+	#SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug
+	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+RESTRICT=strip
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+	tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	x11-libs/libxkbcommon[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[X]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-2017_p20180211[binary]
+		~sys-firmware/ipxe-1.0.0_p20180211[binary]
+		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch
+	"${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch
+	#"${WORKDIR}"/patches
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	default
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		--disable-bluez
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh2)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+		conf_opts+=(
+			--audio-drv-list="${audio_opts}"
+		)
+		use sdl && conf_opts+=( --with-sdlabi=2.0 )
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		if [[ -e check-report.html ]]; then
+			docinto html
+			dodoc check-report.html
+		fi
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	[[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
--- a/app-emulation/vkd3d/vkd3d-1.1.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.1.ebuild
@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~x86"
 	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 fi

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gcstar/metadata.xml
+++ b/app-misc/gcstar/metadata.xml
@ -1,10 +1,7 @@
 <?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-needed -->
 	<longdescription lang="en">
 		GCstar is an application for managing your collections. It supports many
 		types of collections, including movies, books, games, comics, stamps,
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@ -1 +1,2 @@
 DIST eclass-manpages-20180812.tar.xz 419912 BLAKE2B 35659ac43e43e71c600fb4955267c9d57ed36f29e0607150a8e8c061b158b6135a4b91f4e4c05fa178a03aa3068726ac13cd54e4cd135fbe152c8bebf81659bb SHA512 6d01070c6113e5d5f4102d466abaa03ae824350285ca71a5a4f84d859f6c473e8e92d3f5387b76c4bb5dc8bcedcc6b36a63e074d70725c87233dea4fa6a6d0c6
+DIST eclass-manpages-20190310.tar.xz 419588 BLAKE2B 7832ebf2a9ed6fe1cd274094838217348f6c792b64c2b81126788e9035a773509223bec4515d7930fafc83ba8243785add3ec295dd66fc433c7f42bd69209174 SHA512 cd24a571769acb5dcbf179b1194921353f3d5e72f91bcddfbb6c827be259127e355933968ea1a1be1f7fb11b09c5d0c302556ad4c5b8782fc5c5a982a5108a0d
--- a/app-portage/eclass-manpages/eclass-manpages-20190310.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-20190310.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stabled. No need to change to ~arch.
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+DEPEND="app-arch/xz-utils"
+
+# How to create a snapshot and upload it to your dev-space:
+#
+# mkdir eclass-manpages-$(date +%Y%m%d)
+# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
+# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
+# xz -e eclass-manpages-$(date +%Y%m%d).tar
+# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
+#
+# Then copy the ebuild and update your name in SRC_URI ;-).
+
+src_compile() {
+	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_install() {
+	doman *.5
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/unac/metadata.xml
+++ b/app-text/unac/metadata.xml
@ -1,8 +1,5 @@
 <?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-needed -->
 </pkgmetadata>
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -21,7 +21,7 @@ HOMEPAGE="http://xournal.sourceforge.net/"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+pdf vanilla"
+IUSE="+pdf"

 COMMONDEPEND="
 	app-text/poppler[cairo]
@ -43,17 +43,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "

-src_prepare() {
-	default_src_prepare
-	if ! use vanilla; then
-		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
-	fi
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	emake DESTDIR="${D}" desktop-install

-	dodoc ChangeLog AUTHORS README
 	dodoc -r html-doc/*
 }
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@ -1,2 +1 @@
-DIST libjson-rpc-cpp-1.1.0.tar.gz 179442 BLAKE2B cfbfe703d1a3d4ccaf6d4d475a7c1686c8f7afc28b025d6fd3bfebdc41cff2b944e6600e68073c1b7e7c0a2463cbf6e9724cf618c5d481bf7a4600019b529922 SHA512 bf34eedb196b1e214292976036a00e933f8a9b4325441ea2e4ae049a7c818014a68dd9d2f22d01588f5e6d1e9f465c73a133b0fd8282f8cf78a05a493f4c461b
 DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	http-client? ( net-misc/curl:= )
-	http-server? ( net-libs/libmicrohttpd:= )
-	redis-client? ( dev-libs/hiredis:= )
-	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch:1 )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTP_CLIENT=$(usex http-client)
-		-DHTTP_SERVER=$(usex http-server)
-		-DREDIS_CLIENT=$(usex redis-client)
-		-DREDIS_SERVER=$(usex redis-server)
-		# they have no deps
-		-DTCP_SOCKET_CLIENT=ON
-		-DTCP_SOCKET_SERVER=ON
-		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
-		-DUNIX_DOMAIN_SOCKET_SERVER=ON
-		# they are not installed
-		-DCOMPILE_EXAMPLES=OFF
-		-DCOMPILE_STUBGEN=$(usex stubgen)
-		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
-	# Tests fail randomly when run in parallel
-	local MAKEOPTS=-j1
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	http-client? ( net-misc/curl:= )
-	http-server? ( net-libs/libmicrohttpd:= )
-	redis-client? ( dev-libs/hiredis:= )
-	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch:1 )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTP_CLIENT=$(usex http-client)
-		-DHTTP_SERVER=$(usex http-server)
-		-DREDIS_CLIENT=$(usex redis-client)
-		-DREDIS_SERVER=$(usex redis-server)
-		# they have no deps
-		-DTCP_SOCKET_CLIENT=ON
-		-DTCP_SOCKET_SERVER=ON
-		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
-		-DUNIX_DOMAIN_SOCKET_SERVER=ON
-		# they are not installed
-		-DCOMPILE_EXAMPLES=OFF
-		-DCOMPILE_STUBGEN=$(usex stubgen)
-		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
-	# Tests fail randomly when run in parallel
-	local MAKEOPTS=-j1
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@ -1,2 +1,2 @@
-DIST mariadb-galera-10.0.35.tar.gz 66950519 BLAKE2B a0b48de41234d1800c1734782bd604d30512e3d33d1937cd3e79f68ec804089166223ba53450ef630779d2b74bc4ace611dc748b4ceca7ed4e4151f97d693655 SHA512 e0160ef74d45c332edf49f21bb673b926008cba9ba650f97a47d7631260b2517db19e1730b76be77af4ee384aa5cc9b3453a24da57c48ab5f062f937494aee87
-DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6 SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
+DIST mariadb-galera-10.0.38.tar.gz 65157071 BLAKE2B c54341395101e27dd25183da3d09e7ddf72a07cf440a8aea5daa998d53012a93e1f04bb5020dba28d1337b5f11448be6ae3d8624c437db0cf090eff2aa10151d SHA512 219c2400ebdbf4c6933af1d2d1f88c7f795a988b408676a3c93dbb8c82bdb782f661e9a60f5e940baf31feda8e584e9764918e59cfbdfa1356af8712dde17425
+DIST mysql-extras-20190310-0358Z.tar.bz2 331100 BLAKE2B 69f2b1ee404247e04b7d368c08c429f783fa45dface295be9fa2d94822d052a08a40e6a57bec3afc38886eb0badfcb52c92974c6df033bb90be66abb3f05249a SHA512 5fd4a320e4c224514b054cffbbdf3697ed7351cf71ee779c311f024388bbf12673821b0e12994acbccd30fe119214ea4b53edf87e2cb37be39d0448e4b2cf70b
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
-MY_EXTRAS_VER="20180515-1334Z"
+MY_EXTRAS_VER="20190310-0358Z"
 SUBSLOT="18"

 JAVA_PKG_OPT_USE="jdbc"
@ -29,7 +29,7 @@ LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
 IUSE="bindist client-libs debug extraengine jdbc jemalloc latin1 libressl
 	numa odbc oqgraph pam +perl profiling selinux +server sphinx
-	sst-rsync sst-xtrabackup static static-libs systemtap tcmalloc
+	sst-rsync sst-xtrabackup static systemtap tcmalloc
 	test tokudb xml yassl"

 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
@ -77,7 +77,7 @@ COMMON_DEPEND="
 	tcmalloc? ( dev-util/google-perftools:0= )
 	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	>=sys-libs/zlib-1.2.3:0=
@ -96,7 +96,6 @@ COMMON_DEPEND="
 		tokudb? ( app-arch/snappy )
 	)
 	>=dev-libs/libpcre-8.41-r1:3=
-	!client-libs? ( dev-db/mysql-connector-c[static-libs?] )
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
@ -137,6 +136,14 @@ pkg_setup() {
 			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
 			die
 		fi
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
 	fi
 	java-pkg-opt-2_pkg_setup
 	if has test ${FEATURES} && \
@ -203,16 +210,15 @@ src_unpack() {
 	mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die
 }

-disable_engine() {
-	echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-}
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}

-disable_plugin() {
-	echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-}
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}

-src_prepare() {
-	java-pkg-opt-2_src_prepare
 	if use tcmalloc; then
 		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
 	fi
@ -228,28 +234,29 @@ src_prepare() {
 	local test_plugins=( audit_null auth_examples daemon_example fulltext )
 	if ! use server; then # These plugins are for the server
 		for plugin in "${server_plugins[@]}" ; do
-			disable_plugin "${plugin}"
+			_disable_plugin "${plugin}"
 		done
 	fi

 	if ! use test; then # These plugins are only used during testing
 		for plugin in "${test_plugins[@]}" ; do
-			disable_plugin "${plugin}"
+			_disable_plugin "${plugin}"
 		done
 	fi

 	# Collides with mariadb-connector-c bug 655980
-	disable_plugin auth_dialog
+	_disable_plugin auth_dialog

 	# Don't build Mroonga or example
-	disable_engine mroonga
-	disable_engine example
+	_disable_engine mroonga
+	_disable_engine example

 	if ! use oqgraph ; then # avoids extra library checks
-		disable_engine oqgraph
+		_disable_engine oqgraph
 	fi

 	cmake-utils_src_prepare
+	java-pkg-opt-2_src_prepare
 }

 src_configure(){
@ -464,6 +471,10 @@ src_install() {
 		for script in "${S}"/scripts/mysql* ; do
 			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
 		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
 	fi

 	#Remove mytop if perl is not selected
@ -471,7 +482,7 @@ src_install() {
 }

 # Official test instructions:
-# USE='extraengine perl server static-libs' \
+# USE='extraengine perl server' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
@ -800,9 +811,8 @@ pkg_config() {
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--socket=${socket} \
-		--pid-file=${pidfile}
+		--pid-file=${pidfile} \
 		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"
 	${mysqld} &
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@ -1,2 +1 @@
-DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
 DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
--- a/dev-db/pgtap/pgtap-0.98.0.ebuild
+++ b/dev-db/pgtap/pgtap-0.98.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{3..6} 10 )
-
-inherit postgres-multi
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="https://pgtap.org/"
-SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="${POSTGRES_DEP}
-		app-arch/unzip
-		dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@ -12,7 +12,7 @@ else
 		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
 		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi

 DESCRIPTION="Small device C compiler (for various microprocessors)"
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@ -1,3 +1,2 @@
 DIST pcfi-2010.08.09.jar 6731455 BLAKE2B 438dda63e91494231fba890d995227e7c6428b25a698ad5905a7ca0f2a29f511ff4cc34136c96c878ca04ec7630a062bbff3bbf0400a332b4edb6a6972175920 SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b
-DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
 DIST pdfbox-1.8.15-src.zip 11078696 BLAKE2B e468a1c263007484d47861945b50a8b0c9afed2d792619a49f41e57b313d86f4e04d317d1b75406876592d755958771c0468446eb23fe3b26ff529e07d467ffb SHA512 ac3f4b131f5cd2153ec2a744c486db921bc2165d596b243ad673cfc94be1bc4ae27bdf2981b63419fead18db569a2008264d6fdc7c89cf47f69f81c4a7d3a2a6
--- a/dev-java/pdfbox/pdfbox-1.8.11.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BC_SLOT="1.45"
-ADOBE_FILES="pcfi-2010.08.09.jar"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
-	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="test" # Explosive even when manually using unmodified build.xml.
-
-CDEPEND="dev-java/fontbox:${SLOT}
-	dev-java/jempbox:${SLOT}
-	dev-java/bcmail:${BC_SLOT}
-	dev-java/bcprov:${BC_SLOT}
-	>=dev-java/commons-logging-1.1.1:0
-	dev-java/icu4j:55"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="fontbox-${SLOT},jempbox-${SLOT},bcmail-${BC_SLOT},bcprov-${BC_SLOT},commons-logging,icu4j-55"
-
-src_unpack() {
-	unpack ${P}-src.zip
-}
-
-java_prepare() {
-	local DIR=target/classes/org/apache/${PN}/resources
-	mkdir -p "${DIR}/afm" || die
-
-	unzip -j -d "${DIR}" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/glyphlist.txt || die
-	unzip -j -d "${DIR}/afm" "${DISTDIR}/${ADOBE_FILES}" com/adobe/pdf/pcfi/afm/*.afm || die
-
-	echo "${PN}.version=${PV}" > ${DIR}/${PN}.version || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main org.apache.${PN}.PDFBox
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find ${DIR} -name "*Test.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -encoding ${JAVA_ENCODING} -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/rust/rust-1.32.0.ebuild
+++ b/dev-lang/rust/rust-1.32.0.ebuild
@ -107,6 +107,12 @@ src_prepare() {

 	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die

+	# ugly hack for https://bugs.gentoo.org/679806
+	if use ppc64; then
+		sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
+		export OPENSSL_ppccap=0
+	fi
+
 	default
 }

--- a/dev-lang/rust/rust-1.33.0.ebuild
+++ b/dev-lang/rust/rust-1.33.0.ebuild
@ -103,6 +103,12 @@ src_prepare() {

 	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die

+	# ugly hack for https://bugs.gentoo.org/679806
+	if use ppc64; then
+		sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
+		export OPENSSL_ppccap=0
+	fi
+
 	default
 }

--- a/dev-lang/sassc/metadata.xml
+++ b/dev-lang/sassc/metadata.xml
@ -1,10 +1,7 @@
 <?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-needed -->
 <longdescription lang="en">
 	SassC is a wrapper around libsass (http://github.com/sass/libsass)
 	used to generate a useful command-line application that can be
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libmirage/metadata.xml
+++ b/dev-libs/libmirage/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="person">
    <email>mgorny@gentoo.org</email>
    <name>Michał Górny</name>
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@ -1,10 +1,7 @@
 <?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-needed -->
 <longdescription lang="en">
 	LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
 	API. It is coded with portability and efficiency in mind. You can
--- a/dev-libs/openssl/openssl-1.0.2r.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2r.ebuild
@ -22,7 +22,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz

 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"

--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@ -4,3 +4,4 @@ DIST composer-1.7.2.tar.gz 401211 BLAKE2B b3470a45dcffe8758c3e498a6298f726928a03
 DIST composer-1.7.3.tar.gz 402233 BLAKE2B b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f SHA512 7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
 DIST composer-1.8.0.tar.gz 404169 BLAKE2B 977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f SHA512 d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
 DIST composer-1.8.3.tar.gz 405927 BLAKE2B 00be1624fb96212edffd7059b718e74ed69643810de2ddfd6ffa1fb16ac689d2298d420452e7461bb427cc2e8186f4d2c9be072054fe7310bc74c32b80a1a497 SHA512 bb3ddcddcd30c211deae5a75fdfb178c39f0714efd59cb2a4abebdcdc9e18cf9437cae26ed21881fe06278472c150de2935f70b48c3f3c5d7e2a1ea92ee26605
+DIST composer-1.8.4.tar.gz 406561 BLAKE2B 2521da6a50371102c2a8bf61aeeba0c5846692dcbaaa13e83d09a42480c518f91889bd6d6461aef60958d1f68801f77a646c7940c5992a8da25adf050550050b SHA512 b1061fd190b05d2fc309ff76bf246f6d02547249fe52c347715c2dc2e4f5149b3c4e4f43f255874749caeb44ce05cfcbdb8da1d96a9f88a2213a9601e123ef9c
--- a/dev-php/composer/composer-1.8.4.ebuild
+++ b/dev-php/composer/composer-1.8.4.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@ -1 +1,2 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
+DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+# IUSE="test"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
+
+	# Add the following for unit tests, some packages listed will need
+	# to be added and keyworded appropriately.
+#	test? (
+#	dev-python/ddt[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-mock[${PYTHON_USEDEP}]
+#		dev-python/pytest-sugar[${PYTHON_USEDEP}]
+#		dev-python/pytest-testmon[${PYTHON_USEDEP}]
+#		dev-python/pytest-watch[${PYTHON_USEDEP}]
+#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+#		dev-python/coverage[${PYTHON_USEDEP}]
+#		dev-python/codecov[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/trustme[${PYTHON_USEDEP}]
+#		dev-python/pyopenssl[${PYTHON_USEDEP}]
+#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+#	)"
+
+PATCHES=(
+	# https://github.com/CherryPy/cheroot/issues/181
+	"${FILESDIR}"/6.5.4-fix-requirements.patch
+)
+
+# python_test() {
+#	py.test -v || die "tests failed under ${EPYTHON}"
+# }
--- a/dev-python/cheroot/files/6.5.4-fix-requirements.patch
+++ b/dev-python/cheroot/files/6.5.4-fix-requirements.patch
@ -0,0 +1,10 @@
+--- a/setup.cfg	2019-03-09 17:14:40.127863655 -0600
+++ b/setup.cfg	2019-03-09 17:15:22.135345396 -0600
+@@ -57,7 +57,6 @@
+ 	setuptools_scm>=1.15.0
+ 	setuptools_scm_git_archive>=1.0
+ install_requires = 
+-	backports.functools_lru_cache
+ 	six>=1.11.0
+ 	more_itertools>=2.6
+ 
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.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
@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"

 RDEPEND="
--- a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.3.0.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
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"

 BDEPEND="
--- a/dev-python/nautilus-python/metadata.xml
+++ b/dev-python/nautilus-python/metadata.xml
@ -1,8 +1,8 @@
 <?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 type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-python/polib/metadata.xml
+++ b/dev-python/polib/metadata.xml
@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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-needed -->
  <upstream>
    <remote-id type="bitbucket">izi/polib</remote-id>
    <remote-id type="pypi">polib</remote-id>
--- a/dev-python/python-fastimport/metadata.xml
+++ b/dev-python/python-fastimport/metadata.xml
@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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>python@gentoo.org</email>
 		<name>Python</name>
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@ -1,2 +1 @@
-DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
--- a/dev-python/requests/requests-2.18.4-r1.ebuild
+++ b/dev-python/requests/requests-2.18.4-r1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-2.7[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-#DEPEND+="
-#	test? (
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-#		dev-python/pytest-mock[${PYTHON_USEDEP}]
-#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-#		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-#	)
-#"
-
-python_test() {
-	py.test || die
-}
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""

 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy3 )

 inherit distutils-r1

--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@ -1 +1,2 @@
 DIST zope.testing-4.6.2.tar.gz 62710 BLAKE2B 4b70538dc8bbbc4445bcdc8eb2d49c36b4fede893a50007367195aa1017b088ae65805b59566daefd7cfad612ca20c24659cb3da65aa3e307cad3aaa03c67178 SHA512 816c87a38c847aad67857c364bb9999f4283484c933be2bcb54066dac4a6f8c6f94dfde61860397003e7f17b8669e7964a7fbe28e7ca7313f5d131f17c0b672d
+DIST zope.testing-4.7.tar.gz 63474 BLAKE2B dc825849c288b9f8ab9e4edfe670e09aa49f28c64047da8e0fb36cbfa6cf24d70cf6a49ea8a51ca1831b152f3ffa4b0c62cde29750036f13c9f754df2bb80da2 SHA512 cdf87f95196880a0f55c740f6340286bb29e96e9273d0c645bbb50def54a0645cce22d971adba3f15ff57b1021a72749219af83abc4e8fa775fb982d8164791d
--- a/dev-python/zope-testing/zope-testing-4.7.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@ -1,3 +1,4 @@
 DIST fast_gettext-1.6.0.tar.gz 88780 BLAKE2B 237a37bf505fe7520a25c6014f0524201905f8cf112624370477229db2d06f7160bad62e42878688ef954a1b72166e21a7f3a89de66c21aec780749fb26cd8bb SHA512 0f26cf8bd8a2078631d32be14fb6bd194dc9bd8a6727a355f4d2978441c972785747063ec4d8b8b1d4c78f07914a8b6cccf37ed85a37e7833bfe724d1d159ae9
 DIST fast_gettext-1.7.0.tar.gz 89176 BLAKE2B a42f50570c65ecf229dab0e29ad40ed3fd0f431f59fcc7daff4ad564131751e8a9884d52dfb8f2edd87b6fd5d1267973225fb51f9256844b37c28b251d15d757 SHA512 83c66c4f7bce6ccc08c1fe9e2b3cb71ea751d68bbff36587039a0b7af7e6276cb481debd3668673822455b9805114531547b28a777cafa8bda0f204ba36bf5a9
 DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
+DIST fast_gettext-2.0.0.tar.gz 91904 BLAKE2B fc0f752cad55512f502332a8721aa64fe1b3103ecedceac08b82f293575e974e0565b2936ae740e61ef3413919406959c6a78709ddc737b3e7decd710eafbd46 SHA512 f997a63ecccc3a8836e191b8cdcb5ba0e260bedef4cc55efeecb12c1fb3a469cc98e9e565ac773392a2bdf266618a76c8d34b0522d5447967fb85f4dfeea3c10
--- a/dev-ruby/fast_gettext/fast_gettext-2.0.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.0.0.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
--- a/dev-scheme/guile-cairo/Manifest
+++ b/dev-scheme/guile-cairo/Manifest
@ -1,2 +1 @@
-DIST guile-cairo-1.4.0.tar.gz 512208 BLAKE2B e0e5a4eaca54aa2579f0fe7727dea5de48cf11243e04f6fdb692e715932470ac74b2cc24a30b9065edd4e2bcae39b25edc553eed3e79b334416f3227f0fb9bac SHA512 59e70c9a78b50bc8f580984cf67d9708b9a201920736be16d3ee2b8e73abaeac1c2b9d934b1713529043474881cd7258cb8df99ac317f6a10417b08a677c0759
 DIST guile-cairo-1.9.91.tar.gz 578928 BLAKE2B e0b766e1a83ca8d630760b8bdfab0bb0f26cd58bc6e73198f197ae7de7fd53e5a377b64f8b06f69a037caf566d94ce172e6f62a5b0114eedf859ddb6eb9d8021 SHA512 bdade3463bdac2f29519ef3001286e07ca3c57615183f2e5ac121d273f49c4dafaf3125ef7f8630e0695c0d73368c98241c59acdb9c5682be42bddbc4b5a28ac
--- a/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
+++ b/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Wraps the Cairo graphics library for Guile Scheme"
-HOMEPAGE="http://home.gna.org/guile-cairo/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-scheme/guile-1.8
-	>=x11-libs/cairo-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-scheme/guile-lib )"
-
-src_configure() {
-	econf --disable-Werror
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog || die "dodoc failed"
-}
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
--- a/dev-tex/curve/curve-1.16-r1.ebuild
+++ b/dev-tex/curve/curve-1.16-r1.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
@ -11,7 +11,7 @@ SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/${PN}.zip -> ${P}.zip"

 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="doc examples"

 RDEPEND=">=dev-texlive/texlive-latexextra-2010"
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -2,5 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc3.tar.gz 8845905 BLAKE2B 496f478586b8db220364079e5e96cc27dc703879a9f28cc425047bcf6b62d09bda1077cdca5759793995d84258448ce2195cce6b41c0ad2ca401eeb5b20590d0 SHA512 2a783a21428c2e86ff081e35c0a3737b4594904cf560a14b84de11da9d85bd7ad0e1c03a2acbcd26c1e84cbbfbf6b5b273987f0196a121bfdbb94bbfcabd13ca
+DIST cmake-3.14.0-rc4.tar.gz 8846980 BLAKE2B 9f19e18e2a1fab40c9fe2eea067b34190b30d41bc19f1a02e453a7062868a636e9abfae2de14fe346bdd653ab3c7076abe5277a580970dab5c0f77de7cce06cf SHA512 13bc2851ccfed647516b6d04ffac52e7f2456b1a81cfe882a27fbe61b173b61e98be1b62fc22eb0ae51aac4285a7ab8fbf9108d910c13eae92518ae4338ff9e6
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
--- a/dev-util/cmake/cmake-3.14.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc4.ebuild
--- a/dev-util/fix-la-relink-command/metadata.xml
+++ b/dev-util/fix-la-relink-command/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>
--- a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
+++ b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
@ -4,8 +4,8 @@ http://bugs.gentoo.org/show_bug.cgi?id=318429

 Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>

--- Synopsis/Parsers/Cxx/Types.cc
-+++ Synopsis/Parsers/Cxx/Types.cc
+--- a/Synopsis/Parsers/Cxx/Types.cc
+++ b/Synopsis/Parsers/Cxx/Types.cc
@@ -169,7 +169,7 @@
 // Class Types::FuncPtr
 //
--- a/Show More
+++ b/Show More