Sync with portage [Thu Dec 13 01:22:31 MSK 2018].

5 years ago · d91bd2ca2e
parent e6d670c171
commit d91bd2ca2e
412 changed files with 5145 additions and 2085 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/abrt/abrt-2.10.10-r2.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@ -0,0 +1 @@
 DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e
--- a/app-admin/gopass/gopass-1.8.3.ebuild
+++ b/app-admin/gopass/gopass-1.8.3.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 EGO_PN="github.com/gopasspw/gopass"
 inherit golang-vcs-snapshot golang-build bash-completion-r1
 DESCRIPTION="a simple but powerful password manager for the terminal"
 HOMEPAGE="https://www.gopass.pw/"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=">=dev-lang/go-1.11"
 RDEPEND="
 	dev-vcs/git
 	>=app-crypt/gnupg-2
 "
 src_install() {
 	dobin gopass
 	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
 	einstalldocs
 	# install fish completion
 	./gopass completion fish > "${T}"/${PN}.fish || die
 	insinto /usr/share/fish/vendor_completions.d
 	doins "${T}"/${PN}.fish
 	# install bash completion
 	./gopass completion bash > "${T}"/${PN} || die
 	dobashcomp "${T}"/${PN}
 	# install zsh completion
 	./gopass completion zsh > "${T}"/${PN}.zsh || die
 	insinto /usr/share/zsh/site-functions
 	newins "${T}"/${PN}.zsh _${PN}
 }
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/metadata.xml
@ -0,0 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">gopasspw/gopass</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@ -1 +1,2 @@
 DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
 DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
--- a/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
+++ b/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
@ -0,0 +1,25 @@
 From 3620f182745db77b5bf4552a9e8d8cb38fdc0268 Mon Sep 17 00:00:00 2001
 From: Kalev Lember <klember@redhat.com>
 Date: Tue, 4 Dec 2018 22:15:49 +0100
 Subject: [PATCH 2/2] trivial: Add missing config.h include
 ---
 lib/packagekit-glib2/pk-progress-bar.c | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/lib/packagekit-glib2/pk-progress-bar.c b/lib/packagekit-glib2/pk-progress-bar.c
 index e75f319e4..28d8f5ac2 100644
 --- a/lib/packagekit-glib2/pk-progress-bar.c
 +++ b/lib/packagekit-glib2/pk-progress-bar.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 +#include "config.h"
 +
 #include <glib.h>
 #include <string.h>
 #include <unistd.h>
 -- 
 2.19.2
--- a/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
+++ b/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
@ -0,0 +1,38 @@
 From d64070f1782ed06f83be7783e22cf86f4098f34e Mon Sep 17 00:00:00 2001
 From: Ettore Di Giacinto <mudler@gentoo.org>
 Date: Tue, 11 Dec 2018 16:54:42 +0100
 Subject: [PATCH 1/2] Drop $(localstatedir)/cache rules
 This directory can be flushed any moment and pre-existence of folders
 in it cannot be assumed.
 pk-transaction creates the downloads directory as needed. If backends
 need metadata folder they should create it if not found.
 Closes: https://github.com/gentoo/gentoo/pull/1760
 References: https://github.com/hughsie/PackageKit/issues/143
 ---
 src/Makefile.am | 7 -------
 1 file changed, 7 deletions(-)
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 830aaf873..24c9a0b9a 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -166,13 +166,6 @@ pk_self_test_CFLAGS =					\
 TESTS = pk-self-test
 -install-data-hook:
 -	if test -w $(DESTDIR)$(prefix)/; then \
 -		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
 -		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
 -		mkdir -p $(DESTDIR)$(localstatedir)/log; \
 -	fi
 -
 clean-local:
 	rm -f *~
 -- 
 2.19.2
--- a/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
+++ b/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
@ -0,0 +1,196 @@
 From ee8a65b3fd7636a60f8a2b2e509376cbbd8326cb Mon Sep 17 00:00:00 2001
 From: Sven Eden <yamakuzure@gmx.net>
 Date: Tue, 11 Dec 2018 16:59:28 +0100
 Subject: [PATCH 2/2] Add elogind support
 Closes: https://bugs.gentoo.org/620948
 Signed-off-by: Ettore Di Giacinto <mudler@gentoo.org>
 ---
 configure.ac    | 20 +++++++++++++++++++-
 src/Makefile.am |  4 ++++
 src/pk-dbus.c   |  8 ++++----
 src/pk-engine.c | 12 ++++++------
 4 files changed, 33 insertions(+), 11 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index 737c1d4dc..0778c57d3 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -216,7 +216,6 @@ if test x$enable_systemd = xyes; then
 		    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
 		    [has_systemdsystemunitdir=$with_systemdsystemunitdir],
 		    [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
 -	AC_DEFINE(HAVE_SYSTEMD,1,[Build systemd code])
 	AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
 fi
 AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
@@ -228,6 +227,24 @@ AC_ARG_ENABLE(offline-update, AS_HELP_STRING([--enable-offline-update],[enable o
 	      enable_offline_update=$enableval,enable_offline_update=yes)
 AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
 +dnl ---------------------------------------------------------------------------
 +dnl - Use elogind instead of systemd-login
 +dnl ---------------------------------------------------------------------------
 +AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]),
 +	      enable_elogind=$enableval,enable_elogind=no)
 +if test x$enable_elogind = xyes; then
 +	PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no])
 +else
 +	have_elogind=no
 +fi
 +
 +dnl ---------------------------------------------------------------------------
 +dnl --- Is systemd/sd-login.h, either from systemd or elogind, available?
 +dnl ---------------------------------------------------------------------------
 +if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then
 +		AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
 +fi
 +
 dnl ---------------------------------------------------------------------------
 dnl - Generate man pages ? (default enabled)
 dnl ---------------------------------------------------------------------------
@@ -590,6 +607,7 @@ echo "
         cflags:                    ${CFLAGS}
         cppflags:                  ${CPPFLAGS}
         Able to run locally:       ${enable_local}
 +        Use elogind:               ${enable_elogind}
         Use systemd:               ${enable_systemd}
         Enable offline update:     ${enable_offline_update}
         GStreamer plugin:          ${build_gstreamer_plugin}
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 24c9a0b9a..468f31d04 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS =						\
 	$(SQLITE_CFLAGS)				\
 	$(POLKIT_CFLAGS)				\
 	$(PYTHON_CFLAGS)				\
 +	$(ELOGIND_CFLAGS)				\
 	$(SYSTEMD_CFLAGS)				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
 	-DBINDIR=\"$(bindir)\"				\
@@ -100,6 +101,7 @@ packagekit_direct_LDADD =				\
 	$(POLKIT_LIBS)					\
 	$(GIO_LIBS)					\
 	$(ARCHIVE_LIBS)					\
 +	$(ELOGIND_LIBS)					\
 	$(SYSTEMD_LIBS)
 packagekit_direct_LDFLAGS =				\
@@ -128,6 +130,7 @@ packagekitd_LDADD =					\
 	$(POLKIT_LIBS)					\
 	$(GIO_LIBS)					\
 	$(ARCHIVE_LIBS)					\
 +	$(ELOGIND_LIBS)					\
 	$(SYSTEMD_LIBS)
 packagekitd_LDFLAGS =					\
@@ -153,6 +156,7 @@ pk_self_test_LDADD =					\
 	$(POLKIT_LIBS)					\
 	$(GIO_LIBS)					\
 	$(ARCHIVE_LIBS)					\
 +	$(ELOGIND_LIBS)					\
 	$(SYSTEMD_LIBS)
 pk_self_test_CPPFLAGS =					\
 diff --git a/src/pk-dbus.c b/src/pk-dbus.c
 index 0cf512f38..37cc1d83c 100644
 --- a/src/pk-dbus.c
 +++ b/src/pk-dbus.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
  #include <systemd/sd-login.h>
 #endif
@@ -177,7 +177,7 @@ pk_dbus_get_cmdline (PkDbus *dbus, const gchar *sender)
 	return cmdline;
 }
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 static gchar *
 pk_dbus_make_logind_session_id (const gchar *session)
 {
@@ -218,7 +218,7 @@ gchar *
 pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
 {
 	gchar *session = NULL;
 -#ifndef HAVE_SYSTEMD
 +#ifndef HAVE_SYSTEMD_SD_LOGIN_H
 	g_autoptr(GError) error = NULL;
 #endif
 	guint pid;
@@ -248,7 +248,7 @@ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
 	}
 	/* get session from systemd or ConsoleKit */
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	session = pk_dbus_get_session_systemd (pid);
 	if (session == NULL)
 		g_warning ("failed to get session for pid %u", pid);
 diff --git a/src/pk-engine.c b/src/pk-engine.c
 index f63058fbc..7ea87a448 100644
 --- a/src/pk-engine.c
 +++ b/src/pk-engine.c
@@ -98,7 +98,7 @@ struct PkEnginePrivate
 	guint			 owner_id;
 	GDBusNodeInfo		*introspection;
 	GDBusConnection		*connection;
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	GDBusProxy		*logind_proxy;
 	gint			 logind_fd;
 #endif
@@ -256,7 +256,7 @@ pk_engine_emit_offline_property_changed (PkEngine *engine,
 static void
 pk_engine_inhibit (PkEngine *engine)
 {
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	g_autoptr(GError) error = NULL;
 	g_autoptr(GUnixFDList) out_fd_list = NULL;
 	g_autoptr(GVariant) res = NULL;
@@ -303,7 +303,7 @@ pk_engine_inhibit (PkEngine *engine)
 static void
 pk_engine_uninhibit (PkEngine *engine)
 {
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	if (engine->priv->logind_fd == 0)
 		return;
 	g_debug ("closed logind fd %i", engine->priv->logind_fd);
@@ -1701,7 +1701,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
 	}
 }
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 static void
 pk_engine_proxy_logind_cb (GObject *source_object,
 			   GAsyncResult *res,
@@ -1737,7 +1737,7 @@ pk_engine_on_bus_acquired_cb (GDBusConnection *connection,
 	/* save copy for emitting signals */
 	engine->priv->connection = g_object_ref (connection);
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	/* connect to logind */
 	g_dbus_proxy_new (connection,
 			  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
@@ -1883,7 +1883,7 @@ pk_engine_finalize (GObject *object)
 	if (engine->priv->connection != NULL)
 		g_object_unref (engine->priv->connection);
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
 	/* uninhibit */
 	if (engine->priv->logind_fd != 0)
 		close (engine->priv->logind_fd);
 -- 
 2.19.2
--- a/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
+++ b/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
@ -0,0 +1,28 @@
 From f664bbc43d12f4b30431dfe2ecee4c9ebfaf00e5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
 Date: Sat, 1 Dec 2018 18:55:37 +0000
 Subject: [PATCH 1/2] lib/python/packagekit/Makefile.am: Use the detected
 PYTHON version
 This will fix compilation in system where only the "python3"
 executable exists
 ---
 lib/python/packagekit/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/lib/python/packagekit/Makefile.am b/lib/python/packagekit/Makefile.am
 index 617006647..a589cde17 100644
 --- a/lib/python/packagekit/Makefile.am
 +++ b/lib/python/packagekit/Makefile.am
@@ -1,7 +1,7 @@
 BUILT_SOURCES = enums.py
 enums.py: $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c
 -	python $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
 +	$(PYTHON) $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
 if HAVE_PYTHON_BACKEND
 packagekitpythondir = ${PYTHON_PACKAGE_DIR}
 -- 
 2.19.2
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@ -0,0 +1,141 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 # PackageKit supports 3.2+, but entropy and portage backends are untested
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
 HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
 SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/18"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="cron command-not-found elogind +introspection entropy systemd test vala"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )
 	vala? ( introspection )
 	entropy? ( $(python_gen_useflags 'python2*' ) )
 "
 # While not strictly needed, consolekit is the alternative to systemd-login
 # or elogind to get current session's user.
 COMMON_DEPEND="
 	>=app-shells/bash-completion-2
 	dev-db/sqlite:3
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.54.0:2
 	>=sys-auth/polkit-0.114
 	>=sys-apps/dbus-1.3.0
 	${PYTHON_DEPS}
 	elogind? ( >=sys-auth/elogind-229.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
 	systemd? ( >=sys-apps/systemd-213 )
 "
 # vala-common needed for eautoreconf
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	>=dev-cpp/glibmm-2.4
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	dev-libs/vala-common
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.35.0
 	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=app-portage/layman-2[${PYTHON_USEDEP}]
 	|| (
 		>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
 		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 	)
 	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
 	!systemd? ( !elogind? ( sys-auth/consolekit ) )
 "
 PATCHES=(
 	# Fixes QA Notices:
 	# - https://github.com/gentoo/gentoo/pull/1760
 	# - https://github.com/hughsie/PackageKit/issues/143
 	"${FILESDIR}"/${PV}-cache-qafix.patch
 	# Adds elogind support:
 	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
 	# - https://github.com/hughsie/PackageKit/pull/299
 	"${FILESDIR}"/${PV}-elogind-support.patch
 	# From master
 	"${FILESDIR}"/${PV}-use-autotool-python.patch
 	"${FILESDIR}"/${PV}-add-missing-config.h.patch
 )
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	# Disable unittests not working with portage backend
 	# console: requires terminal input
 	sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
 		-e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
 		-e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
 		-e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
 		-e 's:^\(.*/packagekit-glib2/task\)://\1:' \
 		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
 		-i lib/packagekit-glib2/pk-test-daemon.c || die
 	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
 		-e 's:^\(.*/packagekit/transaction-db\)://\1:' \
 		-e 's:^\(.*/packagekit/backend\)://\1:' \
 		-i src/pk-self-test.c || die
 	eapply_user
 	use vala && vala_src_prepare
 	xdg_src_prepare
 	# Needed by elogind patch
 	eautoreconf
 }
 src_configure() {
 	econf \
 		--disable-gstreamer-plugin \
 		--disable-gtk-doc \
 		--disable-gtk-module \
 		--disable-schemas-compile \
 		--disable-static \
 		--enable-bash-completion \
 		--enable-man-pages \
 		--enable-nls \
 		--enable-portage \
 		--localstatedir=/var \
 		$(use_enable command-not-found) \
 		$(use_enable cron) \
 		$(use_enable elogind) \
 		$(use_enable entropy) \
 		$(use_enable introspection) \
 		$(use_enable systemd) \
 		$(use_enable test daemon-tests) \
 		$(use_enable test local) \
 		$(use_enable vala) \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
 src_install() {
 	python_fix_shebang backends/portage/portageBackend.py
 	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete || die
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
 }
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@ -1 +1,2 @@
 DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
 DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.12.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.12.ebuild
@ -0,0 +1,59 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 inherit xdg
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Gtk3 PackageKit backend library"
 HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
 SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 RDEPEND="
 	>=dev-libs/glib-2.54:2
 	media-libs/fontconfig
 	>=x11-libs/gtk+-2:2
 	>=x11-libs/gtk+-3:3
 	x11-libs/pango
 	~app-admin/packagekit-base-${PV}[introspection]
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 S="${WORKDIR}/${MY_P}"
 src_configure() {
 	econf \
 		--disable-bash-completion \
 		--disable-command-not-found \
 		--disable-cron \
 		--disable-gstreamer-plugin \
 		--disable-gtk-doc \
 		--disable-local \
 		--disable-man-pages \
 		--disable-static \
 		--disable-systemd \
 		--disable-vala \
 		--enable-dummy \
 		--enable-gtk-module \
 		--enable-introspection=yes \
 		--localstatedir=/var
 }
 src_compile() {
 	emake -C contrib/gtk-module
 }
 src_install() {
 	emake -C contrib/gtk-module DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete || die
 }
--- a/app-admin/packagekit/packagekit-1.1.12.ebuild
+++ b/app-admin/packagekit/packagekit-1.1.12.ebuild
@ -0,0 +1,18 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DESCRIPTION="PackageKit Package Manager interface (meta package)"
 HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
 SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt5"
 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
 	qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
 DEPEND="${RDEPEND}"
--- a/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild
@ -0,0 +1,57 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit linux-info systemd
 DESCRIPTION="Reliability, Availability and Serviceability logging tool"
 HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
 SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="
 	${DEPEND}
 	sys-devel/gettext
 	dev-db/sqlite
 	sys-apps/dmidecode
 	dev-perl/DBD-SQLite
 "
 pkg_setup() {
 	linux-info_pkg_setup
 	local CONFIG_CHECK="~ACPI_EXTLOG ~DYNAMIC_FTRACE ~FUNCTION_GRAPH_TRACER  ~FUNCTION_TRACER ~STACK_TRACER"
 	check_extra_config
 }
 src_configure() {
 	local myconf=(
 		--enable-abrt-report
 		--enable-aer
 		--enable-arm
 		--enable-extlog
 		--enable-hisi-ns-decode
 		--enable-mce
 		--enable-non-standard
 		--enable-sqlite3
 		--includedir="/usr/include/${PN}"
 		--localstatedir=/var
 	)
 	econf "${myconf[@]}"
 }
 src_install() {
 	default
 	keepdir "/var/lib/${PN}"
 	systemd_dounit misc/*.service
 	newinitd "${FILESDIR}/rasdaemon.openrc" rasdaemon
 	newinitd "${FILESDIR}/ras-mc-ctl.openrc" ras-mc-ctl
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -27,7 +27,7 @@ CDEPEND=">=dev-libs/libuv-1.2.0
 	)
 	tui? (
 		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
+		>=dev-libs/unibilium-2.0.0
 	)
 	dev-libs/libvterm
 	dev-lua/lpeg[luajit=]
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/vagrant/vagrant-2.1.5.ebuild
+++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild
@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/net-ssh-5.0.0:*
 	>=dev-ruby/net-sftp-2.1
 	>=dev-ruby/net-scp-1.2.0
-	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+	dev-ruby/rest-client:2
 	<dev-ruby/mime-types-3:*
 "
--- a/app-emulation/vagrant/vagrant-2.2.2.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.2.ebuild
@ -39,7 +39,7 @@ ruby_add_rdepend "
 	>=dev-ruby/net-ssh-5.0.0:*
 	>=dev-ruby/net-sftp-2.1
 	>=dev-ruby/net-scp-1.2.0
-	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+	dev-ruby/rest-client:2
 	>=dev-ruby/rubyzip-1.2.2
 	>=dev-ruby/vagrant_cloud-2.0.0
 "
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/mksh/mksh-56c.ebuild
+++ b/app-shells/mksh/mksh-56c.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,2 +1,2 @@
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.35.0.tar.xz 39482684 BLAKE2B acf61ad52b9de4ab87913d536890f1f74cd4bca656ec275cd5fe21d6bbb4b97792d7f13f40b85b61f7a27745be2aedfff8b6deb9f8dff980f6f30596c184f1f2 SHA512 c81a00832c812603e5c5752f47ad322fcd9aa5079273385af2e0d8813bf04c4b84cca40210d53207c5b52ac4975ecec725f5560cb3c629f4afe9150229138b0d
--- a/app-text/calibre/calibre-3.35.0.ebuild
+++ b/app-text/calibre/calibre-3.35.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
--- a/app-text/glark/Manifest
+++ b/app-text/glark/Manifest
@ -1 +0,0 @@
 DIST glark-git-1.10.5.tgz 196283 BLAKE2B 4c4dd08e28ff328789f6a355b95bf9d3cb2dd6a6516355ef0b8a902c4a4b88b8cf72b4cbaae73a325d578201e2223b2ef8d95924d0ababfee781d1bcd1fb9b1c SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c
--- a/app-text/glark/glark-1.10.5-r1.ebuild
+++ b/app-text/glark/glark-1.10.5-r1.ebuild
@ -1,38 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
 inherit ruby-fakegem
 DESCRIPTION="File searcher similar to grep but with fancy output"
 HOMEPAGE="https://github.com/jpace/glark"
 SRC_URI="https://github.com/jpace/glark/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE="zip"
 ruby_add_rdepend "
 	>=dev-ruby/logue-1.0.0
 	>=dev-ruby/ragol-1.0.0
 	>=dev-ruby/rainbow-2.0.0:2
 	>=dev-ruby/riel-1.2.0
 	zip? ( dev-ruby/rubyzip:1 )"
 ruby_add_bdepend "test? ( dev-ruby/rubyzip:1 )"
 all_ruby_prepare() {
 	rm -rf doc/ || die
 	# Fix broken links to test data.
 	sed -i -e 's:/proj/org/incava/glark/::g' $(find test -type f) || die
 }
--- a/app-text/glark/metadata.xml
+++ b/app-text/glark/metadata.xml
@ -1,14 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>shell-tools@gentoo.org</email>
    <name>Gentoo Shell Tools Project</name>
  </maintainer>
  <use>
    <flag name="zip">Support for ZIP files using <pkg>dev-ruby/rubyzip</pkg></flag>
  </use>
  <upstream>
    <remote-id type="github">jpace/glark</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-text/jist/Manifest
+++ b/app-text/jist/Manifest
@ -1 +0,0 @@
 DIST jist-1.5.1.gem 13824 BLAKE2B dfa4fce7601969fa74158b8cc4ae3542a1e60e241dc430f920d4f2fb9c963ee281d8c2c2cf355547422228dd91d3809ee4fe9cb0df8cbdea32c793308b63639b SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936
--- a/app-text/jist/jist-1.5.1-r1.ebuild
+++ b/app-text/jist/jist-1.5.1-r1.ebuild
@ -1,31 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 DESCRIPTION="A ruby gem to publish a gist"
 HOMEPAGE="https://github.com/ConradIrwin/jist"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 ruby_add_rdepend "dev-ruby/json:*"
 ruby_add_bdepend "test? ( dev-ruby/webmock:0 )"
 all_ruby_prepare() {
 	# Avoid failing test (due to webmock version?)
 	# We did not run any tests previously
 	rm -f spec/shorten_spec.rb || die
 	sed -i -e '1igem "webmock", "~>1.0"' spec/spec_helper.rb || die
 }
--- a/app-text/jist/metadata.xml
+++ b/app-text/jist/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>ruby@gentoo.org</email>
    <name>Gentoo Ruby Project</name>
  </maintainer>
  <upstream>
    <remote-id type="github">ConradIrwin/jist</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 LIB_DEPEND="
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 LIB_DEPEND="
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 RDEPEND="
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@ -1,2 +1,3 @@
 DIST command-t-5.0.1.tar.gz 81781 BLAKE2B 5d606892d9653c259525b6778cd72309da898fae787964fd4d1c9a6ebfd91e467e1f88f5756d7966c4866f721912164f0bf852efdd19209ce779a56725e2adbf SHA512 54262f4628bbef8a11878a8593510af566dabf35dd70005dc90e4abb4c4e9aebde5dc7d08d808c944980017f8f35d7e9723b0032ccde5ab6d2d2fae38e1c632d
 DIST command-t-5.0.2.tar.gz 83601 BLAKE2B 0391f010252fcd8b48909ad4a8dd504e6cbb74f1a2f776d719a8179f0d44299bfddf8161a2961c9089cbb3a4c4c944daa4adb26927f27c4c3beebceb0b938f53 SHA512 f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81
 DIST command-t-5.0.3.tar.gz 84019 BLAKE2B fec893aa698a1d1bfc86cf7bd08562f19b54e58d81b7650e50acdf17bfcec54f78aae38d05ca5f93ae60c981a6e606d5c68c008be3508c7d41e74aa9f064943a SHA512 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb
--- a/app-vim/command-t/command-t-5.0.3.ebuild
+++ b/app-vim/command-t/command-t-5.0.3.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 inherit vim-plugin ruby-ng
 DESCRIPTION="vim plugin: fast file navigation for vim"
 HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
 SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
 all_ruby_prepare() {
 	find "${S}" -name .gitignore -delete || die
 }
 each_ruby_configure() {
 	cd ruby/${PN}/ext/${PN} || die
 	${RUBY} extconf.rb || die "extconf.rb failed"
 }
 each_ruby_compile() {
 	cd ruby/${PN}/ext/${PN} || die
 	emake V=1
 	rm *.o *.c *.h *.log extconf.rb depend Makefile || die
 }
 each_ruby_install() {
 	local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
 	insinto "${sitelibdir}"
 	doins -r ruby/${PN}/{ext,lib}/*
 }
 all_ruby_install() {
 	rm Gemfile* Rakefile LICENSE README.md || die
 	rm -r appstream bin fixtures data ruby/${PN}/{ext,lib,*.gemspec} spec vendor || die
 	vim-plugin_src_install
 	# make sure scripts are executable
 	chmod +x "${ED}"/usr/share/vim/vimfiles/ruby/${PN}/bin/* || die
 }
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@ -1,2 +1,2 @@
 DIST diffchar-7.01.tar.bz2 19950 BLAKE2B a014fa17e5b15179a4baa8e2cd4fcce36f1cc66cbd8c4ab3a13c0288a510b74f06105d2034666669e2bac2881f5bc5cd81aa1cabb3b80a91f3d67a3bf62bd916 SHA512 3f42f40ec27262f76058d9461ccde80c5badc61d0854c1ff239bea399c26e20eb5cf8960b76901223e937097e18dd7e015fc14a8f7a99907666c518d4baf5117
 DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
 DIST diffchar-8.1.tar.gz 440558 BLAKE2B d10e1db0db4b475af34a268324bec6f8fa1248124df2a40716406d207633f3ca0ef64e2b0673a21c24673c8d0640de936d897a9adfdebbe033ad7c4b10e9648d SHA512 4457b2f769049999c13a2a7ea5a585ba081ab18234c7bcda28e22a481b807edc0c4183229ad7239bc9d10b27270b35c6f27f27f92637693ee869eff09c22fc63
--- a/app-vim/diffchar/diffchar-7.2.ebuild
+++ b/app-vim/diffchar/diffchar-7.2.ebuild
@ -8,6 +8,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/diffchar/diffchar-7.01.ebuild
+++ b/app-vim/diffchar/diffchar-7.01.ebuild
@ -1,13 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-inherit vim-plugin
+inherit vim-plugin vcs-snapshot
 GIT_HASH="057dad8c90d72af5d9bca9cd33746c3b59285191"
 DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 src_prepare() {
 	default
 	rm *.gif *.png *.md || die
 }
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@ -1,2 +1 @@
 DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0
 DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
--- a/app-vim/undotree/undotree-5.0.ebuild
+++ b/app-vim/undotree/undotree-5.0.ebuild
@ -1,12 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit vim-plugin vcs-snapshot
 DESCRIPTION="vim plugin: display your undo history in a graph"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
 SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="amd64 x86"
--- a/app-vim/undotree/undotree-6.0.ebuild
+++ b/app-vim/undotree/undotree-6.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -9,4 +9,4 @@ DESCRIPTION="vim plugin: display your undo history in a graph"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
 SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
--- a/app-vim/vimagit/Manifest
+++ b/app-vim/vimagit/Manifest
@ -1,2 +1,3 @@
 DIST vimagit-1.7.1.tar.gz 35302 BLAKE2B e8e46f399ef700d971e61a233af41a3735faf29fe95baa53b6e0888c0b708a1bfcee051bb9afc90348585f3cb3cf9278fe47a1ed17096d956ccecbc45398c4bc SHA512 8ce2959c135da90b880ccdcd66e71661c7908f250d47a24ede025762a6e9422cebcf8fd516bf99e475605f4278e232713c66293781ceb95f47a22031e9260a71
 DIST vimagit-1.7.2.tar.gz 37398 BLAKE2B c7e0a82ebb7a1d1ae5e2c5aa0c6c8f8a2b45fa65a193b6dcd8a97822d4ecb99ba60dd86156390db4de0fb0ce39883e67a1b17157d8c259a0ad6559a52cefbeb2 SHA512 8b825da4b411732db022b1a3f25f6f779ba5e58df5ca4d404e985b16a4811f911c626674f1a7f4a285d78369f4c7ad3a33b7ffa2b50f1a4a94372a3c5fb29a15
 DIST vimagit-1.7.3.tar.gz 42325 BLAKE2B cad2adc5b61dd2abbfa2cdb58c11e293d2a0d03fd5d08c8f4a08140e5bc397ad6949a20b1c4b3076537dcf8b1b4b2f00f0a90ff62dc8a858ff5b37e0e3b257e0 SHA512 bfc0d49892fdb5c5dfc3ca971bc676081ba820420ad358a888299eb5b92e13f185b0acc6c636a493faef3dc10c7a8b56b7dc4393a08cb5b7012619234782b158
--- a/app-vim/vimagit/vimagit-1.7.3.ebuild
+++ b/app-vim/vimagit/vimagit-1.7.3.ebuild
@ -0,0 +1,25 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit vim-plugin
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
 else
 	SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 DESCRIPTION="vim plugin: ease your git workflow within vim"
 HOMEPAGE="https://github.com/jreybert/vimagit"
 LICENSE="vim"
 VIM_PLUGIN_HELPFILES="${PN}"
 RDEPEND="dev-vcs/git"
 src_prepare() {
 	rm _config.yml || die
 	default
 }
--- a/app-vim/vimagit/vimagit-9999.ebuild
+++ b/app-vim/vimagit/vimagit-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlite/sqlite-3.25.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.25.3.ebuild
@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 RESTRICT="!test? ( test )"
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/ruby/files/2.4/012-openssl_1.1.patch
+++ b/dev-lang/ruby/files/2.4/012-openssl_1.1.patch
@ -0,0 +1,339 @@
 From 7af808153dd34a980e027a04d4490ae38019b3ed Mon Sep 17 00:00:00 2001
 From: Mark Wright <gienah@gentoo.org>
 Date: Sun, 15 Oct 2017 01:24:12 +1100
 Subject: [PATCH] Fix build failure against OpenSSL 1.1 built with
 no-deprecated Thanks rhenium for the code review and fixes.
 ---
 ext/openssl/openssl_missing.h |  4 +++
 ext/openssl/ossl.c            | 23 ++++++---------
 ext/openssl/ossl.h            |  5 ++++
 ext/openssl/ossl_cipher.c     | 14 ++++-----
 ext/openssl/ossl_engine.c     | 54 ++++++++++++++++++++++-------------
 ext/openssl/ossl_ssl.c        |  2 +-
 ext/openssl/ossl_x509cert.c   |  4 +--
 ext/openssl/ossl_x509crl.c    |  4 +--
 8 files changed, 63 insertions(+), 47 deletions(-)
 diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
 index cc31f6ac..debd25ad 100644
 --- a/ext/openssl/openssl_missing.h
 +++ b/ext/openssl/openssl_missing.h
@@ -209,6 +209,10 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
 #  define X509_get0_notAfter(x) X509_get_notAfter(x)
 #  define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x)
 #  define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x)
 +#  define X509_set1_notBefore(x, t) X509_set_notBefore(x, t)
 +#  define X509_set1_notAfter(x, t) X509_set_notAfter(x, t)
 +#  define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t)
 +#  define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t)
 #endif
 #if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION)
 diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
 index 93ecc7d4..245385e7 100644
 --- a/ext/openssl/ossl.c
 +++ b/ext/openssl/ossl.c
@@ -1109,25 +1109,14 @@ Init_openssl(void)
     /*
      * Init all digests, ciphers
      */
 -    /* CRYPTO_malloc_init(); */
 -    /* ENGINE_load_builtin_engines(); */
 +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
 +    if (!OPENSSL_init_ssl(0, NULL))
 +        rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
 +#else
     OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
 -
 -    /*
 -     * FIXME:
 -     * On unload do:
 -     */
 -#if 0
 -    CONF_modules_unload(1);
 -    destroy_ui_method();
 -    EVP_cleanup();
 -    ENGINE_cleanup();
 -    CRYPTO_cleanup_all_ex_data();
 -    ERR_remove_state(0);
 -    ERR_free_strings();
 #endif
     /*
@@ -1149,7 +1138,11 @@ Init_openssl(void)
     /*
      * Version of OpenSSL the ruby OpenSSL extension is running with
      */
 +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
 +    rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION)));
 +#else
     rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
 +#endif
     /*
      * Version number of OpenSSL the ruby OpenSSL extension was built with
 diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
 index f08889b2..5a15839c 100644
 --- a/ext/openssl/ossl.h
 +++ b/ext/openssl/ossl.h
@@ -35,6 +35,11 @@
 #if !defined(OPENSSL_NO_OCSP)
 #  include <openssl/ocsp.h>
 #endif
 +#include <openssl/bn.h>
 +#include <openssl/rsa.h>
 +#include <openssl/dsa.h>
 +#include <openssl/evp.h>
 +#include <openssl/dh.h>
 /*
  * Common Module
 diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
 index bfa76c1a..e6179733 100644
 --- a/ext/openssl/ossl_cipher.c
 +++ b/ext/openssl/ossl_cipher.c
@@ -508,9 +508,9 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     StringValue(iv);
     GetCipher(self, ctx);
 #if defined(HAVE_AUTHENTICATED_ENCRYPTION)
 -    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
 +    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
 	iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
 #endif
     if (!iv_len)
 	iv_len = EVP_CIPHER_CTX_iv_length(ctx);
@@ -535,7 +535,7 @@ ossl_cipher_is_authenticated(VALUE self)
     GetCipher(self, ctx);
 #if defined(HAVE_AUTHENTICATED_ENCRYPTION)
 -    return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
 +    return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -606,7 +606,7 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
     GetCipher(self, ctx);
 -    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
 +    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
     ret = rb_str_new(NULL, tag_len);
@@ -641,7 +641,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
     tag_len = RSTRING_LENINT(vtag);
     GetCipher(self, ctx);
 -    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
 +    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
     if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
@@ -668,7 +668,7 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
     EVP_CIPHER_CTX *ctx;
     GetCipher(self, ctx);
 -    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
 +    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "AEAD not supported by this cipher");
     if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL))
@@ -695,7 +695,7 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
     EVP_CIPHER_CTX *ctx;
     GetCipher(self, ctx);
 -    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
 +    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "cipher does not support AEAD");
     if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL))
@@ -786,9 +786,9 @@ ossl_cipher_iv_length(VALUE self)
     int len = 0;
     GetCipher(self, ctx);
 #if defined(HAVE_AUTHENTICATED_ENCRYPTION)
 -    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
 +    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
 	len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
 #endif
     if (!len)
 	len = EVP_CIPHER_CTX_iv_length(ctx);
 diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
 index d69b5dca..5ca0d4ca 100644
 --- a/ext/openssl/ossl_engine.c
 +++ b/ext/openssl/ossl_engine.c
@@ -46,13 +46,25 @@ VALUE eEngineError;
 /*
  * Private
  */
 -#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
 +#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
 +#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
 do{\
 -  if(!strcmp(#x, RSTRING_PTR(name))){\
 -    ENGINE_load_##x();\
 +  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
 +    if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\
 +      return Qtrue;\
 +    else\
 +      ossl_raise(eEngineError, "OPENSSL_init_crypto"); \
 +  }\
 +}while(0)
 +#else
 +#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x)  \
 +do{\
 +  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
 +    ENGINE_load_##engine_name();\
     return Qtrue;\
   }\
 }while(0)
 +#endif
 static void
 ossl_engine_free(void *engine)
@@ -94,55 +106,55 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     StringValueCStr(name);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_DYNAMIC
 -    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
 +    OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
 #endif
 #if HAVE_ENGINE_LOAD_4758CCA
 -    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
 +    OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
 #endif
 #if HAVE_ENGINE_LOAD_AEP
 -    OSSL_ENGINE_LOAD_IF_MATCH(aep);
 +    OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
 #endif
 #if HAVE_ENGINE_LOAD_ATALLA
 -    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
 +    OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
 #endif
 #if HAVE_ENGINE_LOAD_CHIL
 -    OSSL_ENGINE_LOAD_IF_MATCH(chil);
 +    OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
 #endif
 #if HAVE_ENGINE_LOAD_CSWIFT
 -    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
 +    OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
 #endif
 #if HAVE_ENGINE_LOAD_NURON
 -    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
 +    OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
 #endif
 #if HAVE_ENGINE_LOAD_SUREWARE
 -    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
 +    OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
 #endif
 #if HAVE_ENGINE_LOAD_UBSEC
 -    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
 +    OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
 #endif
 #if HAVE_ENGINE_LOAD_PADLOCK
 -    OSSL_ENGINE_LOAD_IF_MATCH(padlock);
 +    OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
 #endif
 #if HAVE_ENGINE_LOAD_CAPI
 -    OSSL_ENGINE_LOAD_IF_MATCH(capi);
 +    OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
 #endif
 #if HAVE_ENGINE_LOAD_GMP
 -    OSSL_ENGINE_LOAD_IF_MATCH(gmp);
 +    OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
 #endif
 #if HAVE_ENGINE_LOAD_GOST
 -    OSSL_ENGINE_LOAD_IF_MATCH(gost);
 +    OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
 #endif
 #if HAVE_ENGINE_LOAD_CRYPTODEV
 -    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev);
 +    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
 #endif
 #if HAVE_ENGINE_LOAD_AESNI
 -    OSSL_ENGINE_LOAD_IF_MATCH(aesni);
 +    OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI);
 #endif
 #endif
 #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
 -    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 +    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO);
 #endif
 -    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
 +    OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
     rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
     return Qnil;
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
@@ -160,7 +172,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
 +#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
     ENGINE_cleanup();
 +#endif
     return Qnil;
 }
 diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
 index 8e3c0c42..d32a299c 100644
 --- a/ext/openssl/ossl_ssl.c
 +++ b/ext/openssl/ossl_ssl.c
@@ -379,7 +379,7 @@ ossl_call_session_get_cb(VALUE ary)
 /* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
 static SSL_SESSION *
 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
 +#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy)
 #else
 ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
 diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
 index cf82a53d..8d16b9b7 100644
 --- a/ext/openssl/ossl_x509cert.c
 +++ b/ext/openssl/ossl_x509cert.c
@@ -440,7 +440,7 @@ ossl_x509_set_not_before(VALUE self, VALUE time)
     GetX509(self, x509);
     asn1time = ossl_x509_time_adjust(NULL, time);
 -    if (!X509_set_notBefore(x509, asn1time)) {
 +    if (!X509_set1_notBefore(x509, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CertError, "X509_set_notBefore");
     }
@@ -479,7 +479,7 @@ ossl_x509_set_not_after(VALUE self, VALUE time)
     GetX509(self, x509);
     asn1time = ossl_x509_time_adjust(NULL, time);
 -    if (!X509_set_notAfter(x509, asn1time)) {
 +    if (!X509_set1_notAfter(x509, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CertError, "X509_set_notAfter");
     }
 diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
 index 5ecd7ea0..45cf7fb4 100644
 --- a/ext/openssl/ossl_x509crl.c
 +++ b/ext/openssl/ossl_x509crl.c
@@ -226,7 +226,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time)
     GetX509CRL(self, crl);
     asn1time = ossl_x509_time_adjust(NULL, time);
 -    if (!X509_CRL_set_lastUpdate(crl, asn1time)) {
 +    if (!X509_CRL_set1_lastUpdate(crl, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
     }
@@ -257,7 +257,7 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time)
     GetX509CRL(self, crl);
     asn1time = ossl_x509_time_adjust(NULL, time);
 -    if (!X509_CRL_set_nextUpdate(crl, asn1time)) {
 +    if (!X509_CRL_set1_nextUpdate(crl, asn1time)) {
 	ASN1_TIME_free(asn1time);
 	ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
     }
--- a/dev-lang/ruby/ruby-2.4.5-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.4.5-r1.ebuild
@ -0,0 +1,229 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic multilib
 MY_P="${PN}-$(ver_cut 1-3)"
 S=${WORKDIR}/${MY_P}
 SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl )
 	)
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? (
 		dev-lang/tcl:0=[threads]
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
 	virtual/libffi:=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20161226
 	!<dev-ruby/rdoc-3.9.4
 	!<dev-ruby/rubygems-1.8.10-r1"
 DEPEND="${RDEPEND}"
 BUNDLED_GEMS="
 	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
 	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
 	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
 	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
 	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
 	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
 	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
 "
 PDEPEND="
 	${BUNDLED_GEMS}
 	virtual/rubygems[ruby_targets_ruby24]
 	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
 	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
 	xemacs? ( app-xemacs/ruby-modes )"
 src_prepare() {
 	eapply "${FILESDIR}"/${SLOT}/{002,005,009,012}*.patch
 	einfo "Unbundling gems..."
 	cd "$S"
 	# Remove bundled gems that we will install via PDEPEND, bug
 	# 539700. Use explicit version numbers to ensure rm fails when they
 	# change so we can update dependencies accordingly.
 	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
 	einfo "Removing bundled libraries..."
 	rm -fr ext/fiddle/libffi-3.2.1 || die
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
 		configure.in || die "sed failed"
 	eapply_user
 	eautoreconf
 }
 src_configure() {
 	local modules= myconf=
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
 	# as it's risky with newer compilers to leave it as it is.
 	append-flags -fno-strict-aliasing
 	# SuperH needs this
 	use sh && append-flags -mieee
 	# Socks support via dante
 	if use socks5 ; then
 		# Socks support can't be disabled as long as SOCKS_SERVER is
 		# set and socks library is present, so need to unset
 		# SOCKS_SERVER in that case.
 		unset SOCKS_SERVER
 	fi
 	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
 	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	fi
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
 	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
 		modules="${modules},dbm"
 	fi
 	if ! use gdbm ; then
 		modules="${modules},gdbm"
 	fi
 	if ! use ssl ; then
 		modules="${modules},openssl"
 	fi
 	if ! use tk ; then
 		modules="${modules},tk"
 	fi
 	# Provide an empty LIBPATHENV because we disable rpath but we do not
 	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
 	# #564272
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
 		--docdir=${EPREFIX}/usr/share/doc/${P} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \
 		--with-out-ext="${modules}" \
 		$(use_with jemalloc jemalloc) \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		--enable-ipv6 \
 		$(use_enable static-libs static) \
 		$(use_enable static-libs install-static-library) \
 		$(use_with static-libs static-linked-ext) \
 		$(use_enable debug) \
 		${myconf} \
 		--enable-option-checking=no \
 		|| die "econf failed"
 }
 src_compile() {
 	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 src_test() {
 	emake -j1 V=1 test || die "make test failed"
 	elog "Ruby's make test has been run. Ruby also ships with a make check"
 	elog "that cannot be run until after ruby has been installed."
 	elog
 	if use rubytests; then
 		elog "You have enabled rubytests, so they will be installed to"
 		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
 		elog "than root, and you must place them into a writeable directory."
 		elog "Then call: "
 		elog
 		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
 	else
 		elog "Enable the rubytests USE flag to install the make check tests"
 	fi
 }
 src_install() {
 	# Remove the remaining bundled gems. We do this late in the process
 	# since they are used during the build to e.g. create the
 	# documentation.
 	rm -rf ext/json || die
 	# Ruby is involved in the install process, we don't want interference here.
 	unset RUBYOPT
 	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
 	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
 	export LD_LIBRARY_PATH RUBYLIB
 	emake V=1 DESTDIR="${D}" install || die "make install failed"
 	# Remove installed rubygems and rdoc copy
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
 	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
 	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
 	if use doc; then
 		make DESTDIR="${D}" install-doc || die "make install-doc failed"
 	fi
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r sample
 	fi
 	dodoc ChangeLog NEWS doc/NEWS* README* || die
 	if use rubytests; then
 		pushd test
 		insinto /usr/share/${PN}-${SLOT}/test
 		doins -r .
 		popd
 	fi
 }
 pkg_postinst() {
 	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
 		eselect ruby set ruby${MY_SUFFIX}
 	fi
 	elog
 	elog "To switch between available Ruby profiles, execute as root:"
 	elog "\teselect ruby set ruby(23|24|...)"
 	elog
 }
 pkg_postrm() {
 	eselect ruby cleanup
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="debug static-libs stats"
 HTML_DOCS=( doc/jemalloc.html )
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@ -1,2 +1,3 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727ee1a2a93cd6c4ceec94c5628ec20306dc5fa41a2dfcf189afb7a3add33b09a3bcf62f8b5f8fb2ac6657916d3 SHA512 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@ -0,0 +1,20 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils
 DESCRIPTION="Extensible binary format library (kinda like XML)"
 HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
 SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
 	cmake-utils_src_configure
 }
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ b/dev-libs/libreport/libreport-2.9.5.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@ -1,2 +1,3 @@
 DIST libvterm-0.0_pre20160305.tar.xz 665672 BLAKE2B 3f86ada9967f8c5e085ef324330082858c27b07583af2fa4946f74f3edf3bc697cb3335108df89a6de7f058b9649e82fc85b133084c0c8212a98e5f8adab6ce8 SHA512 7e9a44ae679b8c7216f019c0c6b90f1b762f051f58fdb349cfa2a3b2df606940d891547fbc24f05ff32a33e4749242ce8ee2af214b7b3623b83a9f4b9fd53585
 DIST libvterm-0.0_pre20171004.tar.xz 618644 BLAKE2B 07ca64652e09825b5ddf644b962eddcb5c3c97b099da853f091d784a30b5740b77d0f92f8047f8387804cd9ad98f1342ee989cca648bda27260659eb130a2245 SHA512 96b4b113046797a14287f13f39c05da3fe1d52211de44cc11d44848563fa9c234d53a59b66af27721118c2267ad02c9c5b3f6d5be8e1769c708ed90a79b1dcd8
 DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit eutils flag-o-matic multilib
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 DEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig"
 RDEPEND="!dev-libs/libvterm-neovim"
 S=${WORKDIR}/libvterm-0.0
 src_compile() {
 	append-cflags -fPIC
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 src_install() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
 	prune_libtool_files
 }
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 MULTILIB_CHOST_TOOLS=(
--- a/dev-libs/nss/nss-3.40.1.ebuild
+++ b/dev-libs/nss/nss-3.40.1.ebuild
@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/dev-libs/satyr/satyr-0.26.ebuild
+++ b/dev-libs/satyr/satyr-0.26.ebuild
@ -16,7 +16,7 @@ SLOT="0/3"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=dev-libs/elfutils-0.158
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@ -1 +1,2 @@
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
 DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
--- a/dev-libs/tinyxml2/tinyxml2-7.0.1.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-7.0.1.ebuild
@ -0,0 +1,23 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-multilib
 DESCRIPTION="A simple, small, efficient, C++ XML parser"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
 SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/7"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="static-libs test"
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)
 	)
 	cmake-utils_src_configure
 }
--- a/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 if [[ $PV != 9999* ]]; then
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 LICENSE="MIT"
--- a/dev-libs/wayland/wayland-1.16.0.ebuild
+++ b/dev-libs/wayland/wayland-1.16.0.ebuild
@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 LICENSE="MIT"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmoiron/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 BDEPEND="
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ b/dev-python/lxml/lxml-4.2.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@ -1 +1,2 @@
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
--- a/dev-python/mpmath/files/mpmath-1.1.0.patch
+++ b/dev-python/mpmath/files/mpmath-1.1.0.patch
@ -0,0 +1,9 @@
 diff -r -U1 mpmath-1.0.0.orig/setup.py mpmath-1.0.0/setup.py
 --- mpmath-1.0.0.orig/setup.py	2017-09-27 21:42:12.000000000 +0700
 +++ mpmath-1.0.0/setup.py	2017-10-02 20:36:02.919554100 +0700
@@ -15,4 +15,3 @@
                 'mpmath.functions',
 -                'mpmath.matrices',
 -                'mpmath.tests'],
 +                'mpmath.matrices'],
       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
--- a/dev-python/mpmath/files/mpmath.patch
+++ b/dev-python/mpmath/files/mpmath.patch
@ -1,9 +0,0 @@
 diff -r -U1 mpmath-all-0.17.orig/setup.py mpmath-all-0.17/setup.py
 --- mpmath-all-0.17.orig/setup.py	2011-02-02 03:17:50.000000000 +0600
 +++ mpmath-all-0.17/setup.py	2011-02-13 01:18:00.000000000 +0600
@@ -15,4 +15,3 @@
                 'mpmath/functions',
 -                'mpmath/matrices',
 -                'mpmath/tests'],
 +                'mpmath/matrices'],
       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@ -0,0 +1,41 @@
 # 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 distutils-r1 eutils
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://mpmath.org/"
 SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gmp matplotlib test"
 RDEPEND="
 	gmp? ( dev-python/gmpy )
 	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${P}.patch"
 		)
 	# this test requires X
 	rm ${PN}/tests/test_visualization.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	pushd ${PN}/tests >/dev/null
 	${EPYTHON} runtests.py -local
 	popd >/dev/null
 }
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@ -1 +1,2 @@
 DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
--- a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
@ -0,0 +1,37 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 inherit gnome2 python-single-r1
 DESCRIPTION="Python bindings for the Nautilus file manager"
 HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # Require pygobject:3 and USE=introspection on nautilus for sanity,
 # because no (user) plugins could work without them; configure itself
 # requires pygobject:3 or :2 and >=nautilus-2.32
 RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=gnome-base/nautilus-3[introspection]
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 "
 src_install() {
 	gnome2_src_install
 	# Directory for systemwide extensions
 	keepdir /usr/share/nautilus-python/extensions
 }
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@ -1,7 +1,3 @@
 DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
 DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 DIST setuptools-38.5.1.zip 737995 BLAKE2B 9772d39928c6633ca529292d646c1c8e96a5a77ed06545af950cc249922837c13722d97de702c1e104581d56e1f808ec3d077041212517f5a51b23aa2e95e734 SHA512 bd04186a6e73cf24440e82aee10fff09889cab53e2e2fbf178bdb1360accf4f787abf8d8421d5e0fcb41005254c091f62d714e8b317ecf68911e2eed87b9fcc4
 DIST setuptools-38.6.1.zip 738985 BLAKE2B 73e5258b9fe2587b5662e80267e59bbc23484815d997a808c83e030e2dffa9a499fa1bed7e9e127cf3b92cb09451e70e590dd2e71135941124fe9d3383f7dc24 SHA512 38685b97a7c4cdfb67846f910afce5faf60ef1519ccb70acdfd2da83ddbfe1a56b5b03e0b8ce5dbc80dcec14847f716d7b23777e2be0ea7e6afd6da3b645b3ef
 DIST setuptools-40.0.0.zip 849857 BLAKE2B 6ce687904e0c6ef6cd55557ce848583e1645b6c5cfa80b005b25c20e52fc6985be673f2a77a9f79a3a5effc8e581492429bbf73074525827f539a411c6751373 SHA512 c90d136831af822a7f42bbd7eca4c1f4dd73d14f87182aa1251e70610db877b26bcda8fd0a10f5db0fcd84f9098a35b79a130b3142ade9d0081a538778ae53b7
 DIST setuptools-40.6.2.zip 839184 BLAKE2B bc17aeaf7710742b70735f4bd0df2f4d8546eebaae000270b21ce605c83966998a2f51658d243838286f3101d7497c761535a9ffed003ae5e00c81bca8b70ad9 SHA512 3f1aa20e905deb22dda366f479f87cd772238d07e869fdc4f65a7926373414a77b7ddbfd78fd9825154409b3c01d787830354d206a45cdfca879bf35d3b83e03
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@ -1,70 +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 pypy3 )
 PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Collection of extensions to Distutils"
 HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RDEPEND="
 	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
 		python_setup
 		${EPYTHON} bootstrap.py || die
 	fi
 	# disable tests requiring a network connection
 	rm setuptools/tests/test_packageindex.py || die
 	# don't run integration tests
 	rm setuptools/tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
 }
 python_install() {
 	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 	distutils-r1_python_install
 }
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-36.0.1.ebuild
@ -1,67 +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 pypy3 )
 PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Collection of extensions to Distutils"
 HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
 		python_setup
 		${EPYTHON} bootstrap.py || die
 	fi
 	# disable tests requiring a network connection
 	rm setuptools/tests/test_packageindex.py || die
 	# don't run integration tests
 	rm setuptools/tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
 }
 python_install() {
 	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 	distutils-r1_python_install
 }
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-38.5.1.ebuild
@ -1,70 +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="xml(+)"
 inherit distutils-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 fi
 DESCRIPTION="Collection of extensions to Distutils"
 HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
 		python_setup
 		${EPYTHON} bootstrap.py || die
 	fi
 	# disable tests requiring a network connection
 	rm setuptools/tests/test_packageindex.py || die
 	# don't run integration tests
 	rm setuptools/tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
 }
 python_install() {
 	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 	distutils-r1_python_install
 }
--- a/dev-python/setuptools/setuptools-40.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-40.0.0.ebuild
@ -1,70 +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,7} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 fi
 DESCRIPTION="Collection of extensions to Distutils"
 HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 python_prepare_all() {
 	if [[ ${PV} == "9999" ]]; then
 		python_setup
 		${EPYTHON} bootstrap.py || die
 	fi
 	# disable tests requiring a network connection
 	rm setuptools/tests/test_packageindex.py || die
 	# don't run integration tests
 	rm setuptools/tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
 }
 python_install() {
 	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 	distutils-r1_python_install
 }
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/activerecord-deprecated_finders/Manifest
+++ b/dev-ruby/activerecord-deprecated_finders/Manifest
@ -1 +0,0 @@
 DIST activerecord-deprecated_finders-1.0.4.tar.gz 11394 BLAKE2B 252b1b648fc0326e27f5dbd1b2721be6748ecde6df4cac8a23fdc312233498282b87f64388f8844b19e571fb8ab467a0df139f8708baf6ff6beffa3f1ceb774d SHA512 fee0cd5c2778c4d9c0935be1922f1bc9fd4eca28fbe979bb90d0e7fe960592bb1f6f2fac2b80ecce2c6d8ef2416df04a3327d0857e73c9bb8feb3a43cfb11951
--- a/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild
+++ b/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild
@ -1,29 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby22 ruby23"
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem versionator
 DESCRIPTION="Used to extract and deprecate old-style finder option hashes in Active Record"
 HOMEPAGE="https://github.com/rails"
 SRC_URI="https://github.com/rails/activerecord-deprecated_finders/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="$(get_version_component_range 1-2)"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~arm"
 IUSE=""
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	=dev-ruby/activerecord-4*
 	>=dev-ruby/minitest-3
 	>=dev-ruby/sqlite3-1.3 )"
--- a/dev-ruby/activerecord-deprecated_finders/metadata.xml
+++ b/dev-ruby/activerecord-deprecated_finders/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>ruby@gentoo.org</email>
    <name>Gentoo Ruby Project</name>
  </maintainer>
  <upstream>
    <remote-id type="github">rails/activerecord-deprecated_finders</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-ruby/akismet/Manifest
+++ b/dev-ruby/akismet/Manifest
@ -1 +0,0 @@
 DIST akismet-2.0.0.tar.gz 8530 BLAKE2B 11d7201cdc5cb5d798ace70219ef941a85eb53f319e63066fdd442aaade5dd48582bff122db8a0f3418083b4d6af6e94b4dc8971830c50dda4e84e806ecb5663 SHA512 24066e88dfe6bd369b362da60677b8e4acc0785c99fd180e38ff0c11a83131dcb98bc22a7dbce5ff99c8841331fff487090c53bf480a787ec30e58ebba86c762
--- a/dev-ruby/akismet/akismet-2.0.0.ebuild
+++ b/dev-ruby/akismet/akismet-2.0.0.ebuild
@ -1,21 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby23 ruby24"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 inherit ruby-fakegem
 DESCRIPTION="A Ruby client for the Akismet API"
 HOMEPAGE="https://github.com/jonahb/akismet"
 SRC_URI="https://github.com/jonahb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="~amd64"
 IUSE="doc test"
 # Tests now require an API key from akismet and a network connection.
 RESTRICT="test"
--- a/dev-ruby/akismet/metadata.xml
+++ b/dev-ruby/akismet/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>ruby@gentoo.org</email>
    <name>Gentoo Ruby Project</name>
  </maintainer>
  <upstream>
    <remote-id type="github">jonahb/akismet</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-ruby/awesome_print/Manifest
+++ b/dev-ruby/awesome_print/Manifest
@ -1 +0,0 @@
 DIST awesome_print-1.8.0.tar.gz 42605 BLAKE2B d401732991486349b17c2c6947c6674f715cbd33b2987c725a589504d8333e75b7428a9ca5897dcc1d5eacb7a74d7f7f5da84bbd23706e4c43c316718eead858 SHA512 72ac5c4d918c84adba5ea7a60502ac89d57c5734b0b557d0171caae86b5f13ce316c5d7717315ff56c7f7a0959efeb244b6b85f4147c14ec8bf9e128488cf480
--- a/dev-ruby/awesome_print/awesome_print-1.8.0.ebuild
+++ b/dev-ruby/awesome_print/awesome_print-1.8.0.ebuild
@ -1,39 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="Library to pretty print Ruby objects in full color with proper indentation"
 HOMEPAGE="https://github.com/awesome-print/awesome_print"
 SRC_URI="https://github.com/awesome-print/awesome_print/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
 ruby_add_bdepend "test? (
 	dev-ruby/nokogiri
 )"
 all_ruby_prepare() {
 	sed -i -e '/codeclimate/I s:^:#:' \
 		-e '/simplecov/I s:^:#:' \
 		spec/spec_helper.rb || die
 	# Avoid activerecord specs since they don't run
 	# consistently accross rails versions and not all
 	# arches have rails
 	rm -f spec/ext/active_record_spec.rb || die
 }
--- a/dev-ruby/awesome_print/metadata.xml
+++ b/dev-ruby/awesome_print/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>ruby@gentoo.org</email>
    <name>Gentoo Ruby Project</name>
  </maintainer>
  <upstream>
    <remote-id type="github">michaeldv/awesome_print</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@ -2,3 +2,4 @@ DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b30
 DIST bundler-1.16.5.gem 355328 BLAKE2B 684c499abf149fcff4f48881704d96c363f63f004520935767b6e8497f3a06b92c0b4378087383e908256866e29b0f4227a2cec7799d098d74cae896ba2e64db SHA512 d4463d96f6a3b476a3a6f8924a6096ab0efe56807ebae0ddbac897d40e773004ae7d49b1242fc04f77da88e38e879d35022ca4499f4de1ac7b31d5e0fc8a9c31
 DIST bundler-1.16.6.gem 356352 BLAKE2B da6d1d5e7edb5a2a4066cecd7caf33c06d15df2e719aaaa66d9ec9e7ce712eb28612224139f86df016bee28f5f00b767ed683de61dd820c7b40e211e3015a3d2 SHA512 4492786ffd22b86e056dc66c605a943140a1513dbada2334fd3340877f72a3f2138d1bca8f36be3d671f2f9497a69f3a95505db42e938bc30719d15f3896e155
 DIST bundler-1.17.1.gem 363520 BLAKE2B 2edee7490192ee18b23b87892fb2fdf112849276dee40788ec76fde752d6d27c339ee07ba6202dce8a91d418ae21452c0f742f7c1c111a358260a1d7f1a7b1c6 SHA512 6adf044096b7716c8b0dae5f559506c65dcb8fd8a8a57428ac25331ca3a85b7cb399fb40b79aeccb0908d172686df9213b86f69286c3e383373ff5ee6f3b414d
 DIST bundler-1.17.2.gem 364032 BLAKE2B 132a08e43851b16810419b8ec89ead3c8403c0f793a0d585b24fb50d13910bf85d002148c303f7dfa09762c4fa2af14ff829421cca303edacbae6f2a55f12de5 SHA512 8595fb39cf5c490dddd5537bcf5f3ad1120b48c1f86dee592ae977b033cce431eb5a959946510c6f858a4ae3121bfcb0204a699f565bf9ace040547aefa4e07a
--- a/dev-ruby/bundler/bundler-1.17.2.ebuild
+++ b/dev-ruby/bundler/bundler-1.17.2.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 # The specs require a number of gems to be installed in a temporary
 # directory, but this requires network access. They also don't work
 # when run with a path that contains "-".
 RUBY_FAKEGEM_RECIPE_TEST="none"
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 RUBY_FAKEGEM_BINDIR="exe"
 RUBY_FAKEGEM_EXTRAINSTALL="man"
 inherit ruby-fakegem
 DESCRIPTION="An easy way to vendor gem dependencies"
 HOMEPAGE="https://github.com/carlhuda/bundler"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 ruby_add_rdepend virtual/rubygems
 RDEPEND+=" dev-vcs/git"
--- a/dev-ruby/facets/Manifest
+++ b/dev-ruby/facets/Manifest
@ -1 +0,0 @@
 DIST facets-3.1.0.gem 315392 BLAKE2B 0f254e0f93290956e6aa4403a8f29182dd292a32419e129d72ac58d0b3b1c4c00a302b6051900992bf760935f5cd9adac7202299ace1b23270c87550acb37138 SHA512 7b9c957737775609048eff771df5a4ab87f856ea895ae75f55f2ab334ee47e46b80e01833053aa3b455c609e71f6cc3319694530d5687f8422ee8d70c9231f8f
--- a/dev-ruby/facets/facets-3.1.0.ebuild
+++ b/dev-ruby/facets/facets-3.1.0.ebuild
@ -1,36 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
 inherit ruby-fakegem
 DESCRIPTION="Facets is the premier collection of extension methods for Ruby"
 HOMEPAGE="https://rubyworks.github.io/facets/"
 LICENSE="Ruby"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 ruby_add_bdepend "test? (
 	dev-ruby/ae
 	dev-ruby/lemon
 	dev-ruby/rubytest
 	dev-ruby/rubytest-cli )"
 all_ruby_prepare() {
 	# Tests need to write to tmp/
 	mkdir tmp/ || die 'mkdir failed'
 }
 each_ruby_test() {
 	${RUBY} -S rubytest -r lemon -r ae -Ilib/core -Ilib/standard -Itest test/ || die 'tests failed'
 }
--- a/dev-ruby/facets/metadata.xml
+++ b/dev-ruby/facets/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
 </pkgmetadata>
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@ -1,5 +1,3 @@
 DIST http-0.9.8.gem 66560 BLAKE2B 15b6cc066d2b04c3c6df604787f69b5079dacd277dc95a74b56832fc26cd84d2b631b60a60baadaf46368e5dfda30152983c335faea636490000bc5153d11736 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68
 DIST http-1.0.2.gem 62464 BLAKE2B a7801cb8389473f5dee9761fffe510ed2228ecf01d75e61026a110ac8438c9344094a5f50868536f0641740a3663a6aebacdc2f3a8294fa49894549b7a6e3bf0 SHA512 fbfa76f588d46b10dfa0d3b319d0ca1a5a92749575cf27791febaf5d55f2e4458cf34f48d8b9792d4e220c89c702b75b039ca5b66d3c43d31bab982082312113
 DIST http-2.2.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9d52dcfa5fe3f6880000a4dff749810c7816bd1920597f456f7c9e7c080a4e524d578983944f0d49194 SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed
 DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
 DIST http-4.0.0.gem 72704 BLAKE2B 6a7abec739f545e96b013d4bc10b11acd2cd6e336032cab08977476a0c50b73993ba9c8d46b68c7f891ae6129cddc5566bcdc16cc958b16a2241a5fdc1d2bc8c SHA512 78fee306d0d53068b8082bffc766cb12c8d1a030407648af6c4471cab9d63e2c55e75c9546b684bcaabc795c04b76b91c562e4969e597ec70aed0e16052586b1
--- a/dev-ruby/http/http-1.0.2.ebuild
+++ b/dev-ruby/http/http-1.0.2.ebuild
@ -1,40 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 inherit ruby-fakegem
 DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 LICENSE="MIT"
 SLOT="1.0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/addressable-2.3
 	>=dev-ruby/http-cookie-1.0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 ruby_add_bdepend "
 	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
 all_ruby_prepare() {
 	sed -i -e '/simplecov/,/end/ s:^:#:' \
 		-e '1irequire "cgi"' spec/spec_helper.rb || die
 	# Avoid specs that require network access
 	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
 		spec/lib/http_spec.rb || die
 	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
 		spec/lib/http/client_spec.rb || die
 }
--- a/dev-ruby/http/http-2.2.2.ebuild
+++ b/dev-ruby/http/http-2.2.2.ebuild
@ -1,43 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 inherit ruby-fakegem
 DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 LICENSE="MIT"
 SLOT="2.0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/addressable-2.3
 	>=dev-ruby/http-cookie-1.0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 ruby_add_bdepend "
 	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
 all_ruby_prepare() {
 	sed -i -e '/simplecov/,/end/ s:^:#:' \
 		-e '1irequire "cgi"' spec/spec_helper.rb || die
 	# Avoid specs that require network access
 	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
 		spec/lib/http_spec.rb || die
 	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
 		spec/lib/http/client_spec.rb || die
 	# Avoid spec that may fail with a running web server
 	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^    end/ s:^:#:' spec/lib/http_spec.rb || die
 }
--- a/dev-ruby/kramdown/kramdown-1.17.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-1.17.0.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
@ -25,7 +25,7 @@ DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
 ruby_add_rdepend "dev-ruby/prawn:2
 	>=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2*
-	>=dev-ruby/rouge-1.8:*
+	>=dev-ruby/rouge-1.8
 	>=dev-ruby/itextomml-1.5
 	>=dev-ruby/coderay-1.0.0
 	>=dev-ruby/ritex-1.0
--- a/Show More
+++ b/Show More
		`@ -0,0 +1 @@`
							`DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e`
`@ -1 +1,2 @@`
		`DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b`
	`DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83`	`DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83`
		`@ -1 +0,0 @@`
			`DIST glark-git-1.10.5.tgz 196283 BLAKE2B 4c4dd08e28ff328789f6a355b95bf9d3cb2dd6a6516355ef0b8a902c4a4b88b8cf72b4cbaae73a325d578201e2223b2ef8d95924d0ababfee781d1bcd1fb9b1c SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c`
		`@ -1 +0,0 @@`
			`DIST jist-1.5.1.gem 13824 BLAKE2B dfa4fce7601969fa74158b8cc4ae3542a1e60e241dc430f920d4f2fb9c963ee281d8c2c2cf355547422228dd91d3809ee4fe9cb0df8cbdea32c793308b63639b SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936`
`@ -1,2 +1 @@`
	`DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0`
	`DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49`	`DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49`
`@ -1 +1,2 @@`
	`DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1`	`DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1`
		`DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380`
`@ -1 +1,2 @@`
	`DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7`	`DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7`
		`DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc`
`@ -1 +1,2 @@`
	`DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef`	`DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef`
		`DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc`
		`@ -1 +0,0 @@`
			`DIST activerecord-deprecated_finders-1.0.4.tar.gz 11394 BLAKE2B 252b1b648fc0326e27f5dbd1b2721be6748ecde6df4cac8a23fdc312233498282b87f64388f8844b19e571fb8ab467a0df139f8708baf6ff6beffa3f1ceb774d SHA512 fee0cd5c2778c4d9c0935be1922f1bc9fd4eca28fbe979bb90d0e7fe960592bb1f6f2fac2b80ecce2c6d8ef2416df04a3327d0857e73c9bb8feb3a43cfb11951`
		`@ -1 +0,0 @@`
			`DIST akismet-2.0.0.tar.gz 8530 BLAKE2B 11d7201cdc5cb5d798ace70219ef941a85eb53f319e63066fdd442aaade5dd48582bff122db8a0f3418083b4d6af6e94b4dc8971830c50dda4e84e806ecb5663 SHA512 24066e88dfe6bd369b362da60677b8e4acc0785c99fd180e38ff0c11a83131dcb98bc22a7dbce5ff99c8841331fff487090c53bf480a787ec30e58ebba86c762`