Sync with portage [Sun Dec 23 13:23:06 MSK 2018].

2018-12-23 13:23:06 +03:00 · 2018-12-23 13:23:06 +03:00 · 83a62cc369
commit 83a62cc369
parent 6184129d58
3321 changed files with 13140 additions and 11573 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@ -1,4 +1,4 @@
 DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc4cbe199eeae3c837f60b5057915e4d1ffb0fd371b3296cea398a11135b9d8da147451997514c85447722d086b8739 SHA512 fd572666858f1aeeede9e1b2074668d0bd691f58d51acd7955a3203b27d3ee850784a39e47941a570a833926a4109645eb98c24b49263276d1df475578c17efa
 DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
 DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
-DIST filebeat-6.5.2.tar.gz 25277622 BLAKE2B 9a18270e7f147528a324b8ec2c06780ab92bae5a67456d141e66a21cbf8962ef085b7e750476f204e01265cf56cbdec1a3dbe298b037ed59cae8a850205cbd2e SHA512 a4417ecc9ef46ac0b4263434baa4c04058fba82ff312fc8dd9cfd94cbd4c0536ad19a47a18c09707e84360af2eacc64e23715d76359360c38f91e5e7ef8e8d99
+DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
--- a/app-admin/filebeat/filebeat-6.5.4.ebuild
+++ b/app-admin/filebeat/filebeat-6.5.4.ebuild
--- a/app-admin/fluentd/fluentd-1.2.6.ebuild
+++ b/app-admin/fluentd/fluentd-1.2.6.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-fakegem user
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
-	>=dev-ruby/msgpack-0.7.0
-	>=dev-ruby/yajl-ruby-1.0
-	>=dev-ruby/coolio-1.4.5
-	>=dev-ruby/serverengine-2.0.4
-	>=dev-ruby/http_parser_rb-0.5.1
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/tzinfo-1.0
-	>=dev-ruby/strptime-0.2.2"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tzinfo-data/d' \
-		-e '/dig_rb/d' \
-		"${PN}".gemspec || die "'sed failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	keepdir /var/log/fluentd
-	fowners fluentd:adm /var/log/fluentd
-	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A default configuration file has been installed in"
-		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
-		elog "this file to match your configuration."
-	fi
-}
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@ -1,7 +1,7 @@
 DIST logstash-5.6.13.tar.gz 104517136 BLAKE2B c4f0ba5f8e1624ef0493e553166a3c18aab9c4d73a661a5f91988627ec8470dc8a1b52461673e27169c8c10b33dfdeffeef96e70e1a8a04b7ee4a1e71a9afb68 SHA512 df12877b8d28ce9392f9d9ec9414205dd1f628a8e927c8b31f0ad3c3c7b11108509fe6b44119faa3f1bab393ea7be74a3a7c5b5b6b49d6ff5b54ce31fd024a04
 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
 DIST logstash-6.4.3.tar.gz 153936585 BLAKE2B efdcc4664587a3ab18e2e78136c92bc643e99989fa5ac1cd1daaeb48ca1f6fa57f122a5686ddcaab59d920a0ef0e59dc70f59c05a520b731347f37d8faa78c38 SHA512 39bab1b9b0c9f0006c2ad7aa152b3863179030352202ec0c4c4a887bdeb98d4c34127699655cfc7c5b9f44119b45de9629bfacc670d520dcf266b3298fdf2484
-DIST logstash-6.5.2.tar.gz 160290894 BLAKE2B 5ddd7df30b1ba121fd0b28a9a7a9f21af487c3beb310509ce532766b5d652de46e4df3fc0ad9cb391e3256a12811b1d841859ab9124c0646c16e72d5e337b655 SHA512 2595a47c7834425f61e5e2fc2a34b1a87895db3e262e371c2faa588553de6530f395b2bc311e696ed5cac1b5d225a7ca97d1c6efe6906452791765920da8275f
+DIST logstash-6.5.4.tar.gz 160286824 BLAKE2B 6f76edee968566539670b0ffc5462a0a417d39dc8f7d3fab35704ace23c27503f7051a064fca2820d52b100a19818621841356f8e1df20a80c95902f4c1c7f95 SHA512 8dff51b3944219b462002d0ced4ae7050d8ab8f9335de1132be11ab8e7277731f319c5794601881ee94350152725c599093316c5ef55ddc95279697ec794cc57
 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
 DIST logstash-oss-6.4.3.tar.gz 153809786 BLAKE2B 774e67b7f3b89747299fda520456164186e843dedbea4b6727fa325dc8148ea1b25fcb2105e76b84330729a55390e597fac93cf2e2f258e83f2b6cc1c1091372 SHA512 c84e4fcdbf8e96e5d3005186bdf45f20939bb065f02370128b4e15273c4c0fe5609bab606fc7a6a2b71fcee90beb3f435ff42c9126efaed436bf5af1d784c56a
-DIST logstash-oss-6.5.2.tar.gz 160161702 BLAKE2B fac7d07c09f80756e3dbc4c36768a1b88a0710eb4c7fb6e5cc5e630f37cd9548917f8ddb51dad97abd8a06bd9a9cbd7710532fa264c80d0af8d0137aaf2aec8d SHA512 509ff8d4bf8a9954d70fc126d379e969c062f8e8ccaf304895a7596abf7e546936fc686fe1f94fa8f536eff86d9307276c5c8b46a4b5a10a8da38a61265479a2
+DIST logstash-oss-6.5.4.tar.gz 160157672 BLAKE2B 47a6de33697ccc04ba08cb15086cb17ead20a38c9348619ddcd383e61c20265864451939f5be10ec9ebd0ba9b0667264af389130f87181734b942efa49c7e705 SHA512 0b8384e48bc584236fa7369339843c9aa1d08fb09a80e209beabf8e029f2fb5a4a5a1a5ef8b91f069cb35472d3b8147752749a4f6a84c6fc5a2cc801ac8d3c91
--- a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@ -1,2 +1 @@
 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/packagekit-base-1.1.1-cache-qafix.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
@ -1,15 +0,0 @@
--- a/src/~Makefile.am	2016-06-29 10:59:14.178918032 +0200
-+++ b/src/Makefile.am	2016-06-29 11:02:50.739929627 +0200
-@@ -175,11 +175,7 @@ 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 *~
--- a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
@ -1,184 +0,0 @@
--- a/config.h.in	2017-06-07 16:38:45.046910693 +0200
-+++ b/config.h.in	2017-06-07 16:39:06.973911120 +0200
-@@ -78,8 +78,8 @@
- /* Define to 1 if you have the <string.h> header file. */
- #undef HAVE_STRING_H
- 
-/* Build systemd code */
-#undef HAVE_SYSTEMD
-+/* Build systemd-login code */
-+#undef HAVE_SYSTEMD_SD_LOGIN_H
- 
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
--- a/configure.ac	2017-06-06 09:03:57.171355965 +0200
-+++ b/configure.ac	2017-06-06 09:55:11.242384458 +0200
-@@ -254,7 +254,6 @@
- 		    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"])
-@@ -267,6 +266,24 @@
- 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 ---------------------------------------------------------------------------
- AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
-@@ -629,6 +644,7 @@
-         cflags:                    ${CFLAGS}
-         cppflags:                  ${CPPFLAGS}
-         Able to run locally:       ${enable_local}
-+        Use elogind:               ${enable_elogind}
-         Use systemd:               ${enable_systemd}
-         Enable offline update:     ${enable_offline_update}
-         Networking stacks:         ${networking_apis}
--- 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 =					\
--- a/src/pk-engine.c	2017-06-06 09:12:23.828371176 +0200
-+++ b/src/pk-engine.c	2017-06-06 09:55:47.426385545 +0200
-@@ -98,7 +98,7 @@
- 	guint			 owner_id;
- 	GDBusNodeInfo		*introspection;
- 	GDBusConnection		*connection;
-#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- 	GDBusProxy		*logind_proxy;
- 	gint			 logind_fd;
- #endif
-@@ -281,7 +281,7 @@
- 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;
-@@ -331,7 +331,7 @@
- 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);
-@@ -1830,7 +1830,7 @@
- 	}
- }
- 
-#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_engine_proxy_logind_cb:
-  **/
-@@ -1872,7 +1872,7 @@
- 	/* 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,
-@@ -2031,7 +2031,7 @@
- 	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);
--- a/src/pk-dbus.c	2017-06-06 09:12:13.254370858 +0200
-+++ b/src/pk-dbus.c	2017-06-06 10:09:17.249409857 +0200
-@@ -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 @@
- 	return cmdline;
- }
- 
-#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_dbus_get_session_systemd:
-  **/
-@@ -220,7 +220,7 @@
- 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;
-@@ -250,7 +250,7 @@
- 	}
- 
- 	/* get session from systemd or ConsoleKit */
-#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- 	session = pk_dbus_get_session_systemd (pid);
- #else
- 	/* get session from ConsoleKit */
--- a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# PackageKit supports 3.2+, but entropy and portage backends are untested
-# Future note: use --enable-python3
-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 )
-"
-
-# 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.46.0:2
-	>=sys-auth/polkit-0.98
-	>=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-204 )
-"
-# vala-common needed for eautoreconf
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/glibmm-2.4
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-libs/vala-common
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.35.0
-	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}"/${PN}-1.1.1-cache-qafix.patch
-
-	# Adds elogind support:
-	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
-	"${FILESDIR}"/${P}-elogind-support.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() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files --all
-
-	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
-}
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@ -1,2 +1 @@
 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.7.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-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.46: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
-	prune_libtool_files --all
-}
--- a/app-admin/packagekit/packagekit-1.1.7.ebuild
+++ b/app-admin/packagekit/packagekit-1.1.7.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -1,7 +1,5 @@
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
-DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
-DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
-DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bfa97855df28ccc8134c7d744cc0539e5d9efcd72f7eaa5407504897bc274419963843afa4c81964732dc5d6f0337cd SHA512 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999
 DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
+DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@ -1,170 +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} )
-
-inherit autotools python-single-r1 eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0 )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/ivykis-0.36.1
-	>=dev-libs/libpcre-6.1
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!dev-libs/eventlog
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
-	"${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch"
-)
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in "${FILESDIR}"/*logrotate*.in ; do
-		local bn=$(basename "${f}")
-
-		sed \
-			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
-			"${f}" > "${T}/${bn/.in/}" || die
-	done
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		--disable-java \
-		--disable-java-modules \
-		--disable-riemann \
-		--enable-manpages \
-		--localstatedir=/var/lib/syslog-ng \
-		--sysconfdir=/etc/syslog-ng \
-		--with-embedded-crypto \
-		--with-ivykis=system \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
-		$(use_enable caps linux-caps) \
-		$(use_enable dbi sql) \
-		$(use_enable geoip) \
-		$(use_enable http) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
-		$(use_enable pacct) \
-		$(use_enable python) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable spoof-source) \
-		$(use_enable systemd) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-
-	if use systemd; then
-		echo
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-		echo
-	fi
-}
--- a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
@ -1,164 +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} )
-
-inherit autotools eapi7-ver python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.36.1
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+EAPI=7

-inherit autotools eapi7-ver python-single-r1 systemd
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit autotools python-single-r1 systemd

 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
 RESTRICT="test"
@ -28,6 +28,7 @@ RDEPEND="
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip? ( >=dev-libs/geoip-1.5.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
@ -57,16 +58,16 @@ src_prepare() {
 	use python && python_fix_shebang .

 	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver || die
+	rm -r lib/ivykis || die

 	# drop scl modules requiring json
 	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|nodejs|osquery|slack/d' scl/Makefile.am || die
 	fi

 	# drop scl modules requiring http
 	if use !http; then
-		sed -i -r '/telegram/d' scl/Makefile.am || die
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
 	fi

 	# use gentoo default path
@ -111,6 +112,7 @@ src_configure() {
 		$(use_enable caps linux-caps)
 		$(use_enable dbi sql)
 		$(use_enable geoip)
+		$(use_enable geoip2)
 		$(use_enable http)
 		$(use_enable ipv6)
 		$(use_enable json)
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@ -1,2 +1,3 @@
 DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
+DIST sysbench-1.0.16.tar.gz 1508595 BLAKE2B 0cd7818097fb617362d79f135a45942ddf3e55435364355b063eea22ec5f1666737d8e887baae237d8a895c1f8d9f0c1dd0d145c6c46f2827d8ce3eba696ca18 SHA512 f86db33dcb46c9a6f696418de6463a597c6635dc66aecb2e2e53948c299dd7d1d4dfcb7c37d78cd024113ae5484dfaf48ff1cc0a4aefbc586976a665b2df1ca6
--- a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.15.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="aio mysql postgres test"

 RDEPEND="aio? ( dev-libs/libaio )
--- a/app-benchmarks/sysbench/sysbench-1.0.16.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.16.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED%/}"/usr/bin/${PN}
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
@ -19,6 +19,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 "
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -2,3 +2,4 @@ DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb03
 DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
 DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979 SHA512 eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
 DIST docker-compose-1.23.1.tar.gz 302224 BLAKE2B 510a6236194297dd68b3b1a00239142d0f5dd1cacb79a82604a22e7f57581f778ad6027d0108ff896e9f4354c5eb0e1fb2ceea4285bee6a47e5cb8e32a3e5a75 SHA512 d294663e575657c361602693d66aca1ae3c0f5d4b25a74f4ab575be34054dc3168cb77d59fedf981f6bc98e253e87791187440f10c6957254c4f2e29ef7063d0
+DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66 SHA512 baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
@ -0,0 +1,72 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,6}} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2
+	>=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/docker-py-4.0
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	<dev-python/requests-2.21
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,2 +1,2 @@
 DIST VBoxGuestAdditions_5.2.22.iso 58013696 BLAKE2B 196f0048b685200328bcf753f3df23eac6477ce863885e93a54951795368bf62bdaa497589001ec203d75809b1f74ebbaa80419406d26bc7db43a131f5b9d698 SHA512 b320174b2f2ef796ac2c9c920579be38f0cedaa037d21992863ac355ecf6e99ae2aea56c70fb2034e9e03afac2cd7297f7717b447a6981701755593110164d37
-DIST VBoxGuestAdditions_6.0.0_RC1.iso 75374592 BLAKE2B 0315af8f8eb7925ed5f5ade204ebdbd85c175bd43013ca878bce88a589c972651aa04ed1ac0f70f0d5c535c10ff760fd8fa4534b256b1e866f51a8e614ccd0ba SHA512 092fc44442f45ebcf8352dac2766522e32899a9f1e37413cae841178fd776f7fe47d045e65679bd7d14eac50c3d6508a27174b52beae89da0e8a0399451a58e6
+DIST VBoxGuestAdditions_6.0.0.iso 79245312 BLAKE2B 413501b62bb6c8a0b1cef8255c631d4bc6c919b3a9c15e0fd780f6196e299f72ede083d51ca8f32bb83ec6d9384f1959c619bc5df67495a23bce503cf45c39e8 SHA512 4064bab634e8ebd75bc80c47ebd9a2596701505e15ebe872e1b599a42588ece307f90febfd474e429cd7e5e4ecf063bc7e37d666c6ae369f8f97b36a0e0ed81d
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.0_rc1.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.0_rc1.ebuild
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,8 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0_RC1-127378.tar.gz 23311613 BLAKE2B 4846abf409305aff1f08b8a02b3b54e2e1a986efede882ee6e7fe339cef569ea9b2d7dc6c8b5fd5267e64714f9a67b3da857dbb21b6cc26d7badb1d889054ee5 SHA512 bc9c19591cb98bf2c3372bdd4fc90be55c46c7c840e18c73bca063665806df570d77e5ef3c81910334b971eb360b0fa41f2602d6ddf5ad8dfda3a41362450748
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
 DIST VirtualBox-5.2.22-126460-Linux_amd64.run 88821201 BLAKE2B 1b0433844247ee9531af915dcbb740183fa29fb296f8c78b4165cc3b48300da71f7d329026983da581ffff0d7b8976a2e5e32d5e948861a557ddfa2437813ea0 SHA512 22b20a68884a114818fcdfe9a459a7c3b1b3598526a74cc66407f5bcdc6eb6bcbe022b820477ccdc081e22349777b73fac9d6126585ee3c8fa0d3d24624006f3
 DIST VirtualBox-5.2.22-126460-Linux_x86.run 87817677 BLAKE2B 5f11e5f92386c9524869082cf1a5af413c69fe5b36b1ace58887076000c7b928267eb7c3be22282885d6871ccdcee981ec79a526c71f281f0e8ada5858194851 SHA512 32d44b6d691e33a1ee1426cb7a3cb3648722709c588d177951b8be802546faadfd612567981bbbfed3d782b18260e6e638e7879813f3b06bb5a8387b052b0227
-DIST VirtualBox-6.0.0_RC1-127378-Linux_amd64.run 146912718 BLAKE2B f7f289967214b70b3ead711e7cc7ea75d173e3c5734cda7de566b21ef5b864134fa0fa713ec71c20c1486d6e17ef6d54e266745182d6f58996d577304ac56521 SHA512 41481a885f02f95adccd45ff3c2f0b5cedfed0e5607f5d9700e01a3bb6b050a18055d55abe9500948d7c34fdcecb5a6e0558d39432fe1bc13fc3ce49e96961c8
-DIST VirtualBox-6.0.0_RC1-127378-Linux_x86.run 145765835 BLAKE2B 897baa22ac6778dd43ccbd49251a5aa9bf84cd1ed3a469e34a4d2427a6f1ed183193f770d3710e68230ab59c9199a04c6cb808e56320a84b561ab9ff116f44df SHA512 19ce605ae5108352d509eca5504179ddaee8c523dec9d34b25cdd9274952423a0771eb0f4e9a2082cf642b3f9cc2186f7b696dfc947a9e87929e6c8058e2b19e
+DIST VirtualBox-6.0.0-127566-Linux_amd64.run 148766154 BLAKE2B 2e23341dc798aabc1fd696422073516b6f2f70b9bee525ef22528b72abf38acf24599442e5c56d52c24af48f5ae6e2e6cdee981293fc644fac965cc34041a101 SHA512 19b11f7cf62288624739547755a7732b7d355ba61040c7e951ecbaf0ce75252075e8168aa41054e31fa36d45998f1ae1136b65d09981475a3052c4da7fd3021b
 DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
-DIST VirtualBoxSDK-6.0.0_RC1-127378.zip 10749892 BLAKE2B f9b604aefc0e2e0c385e7ba6ce466e681e0154f194542399f44a50f5811798b4ba8be433ac1b6d53e3d24e7be696cdcd5c82f995f6058fce7ef4fd4a1f865177 SHA512 5f30d29527fd7ad1c8df70e2f30071577569e8fadc3bcdf7fcf5a1e164f9290b1f2aa10f8437a8651dfb09bc401501c99682b8755adb34acd4cdfb2b5b576e35
+DIST VirtualBoxSDK-6.0.0-127566.zip 10749531 BLAKE2B 98a9d1d85a5d835e9a6d1ed121f6650d795a695bf40fb05af235eba6454237a79487f801d6351f3c446b523001271faac8cc09880522f97cae73360c1179edf5 SHA512 1f25b9249c5e1e0a7caee867b1508f517e16afd23055decfe27a513d1199ebc72bfcd391a8e750403ddb80a4087df7cfd928604b827976d7075829c7e3d82e00
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127378_rc1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127378_rc1.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
 	MY_PV="${MY_PV/rc/RC}"
 else
 	MY_PV="${MAIN_PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64" #~x86
 fi
 VBOX_BUILD_ID="$(ver_cut 4)"
 VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
@ -30,8 +30,8 @@ SDK_P="VirtualBoxSDK-${SDK_PV}"
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
 	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )

 LICENSE="GPL-2 PUEL"
 SLOT="0"
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,2 +1,2 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0_RC1-127378.tar.gz 23311613 BLAKE2B 4846abf409305aff1f08b8a02b3b54e2e1a986efede882ee6e7fe339cef569ea9b2d7dc6c8b5fd5267e64714f9a67b3da857dbb21b6cc26d7badb1d889054ee5 SHA512 bc9c19591cb98bf2c3372bdd4fc90be55c46c7c840e18c73bca063665806df570d77e5ef3c81910334b971eb360b0fa41f2602d6ddf5ad8dfda3a41362450748
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127378_rc1.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127378_rc1.ebuild
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,4 +1,4 @@
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
-DIST VirtualBox-6.0.0_RC1.tar.bz2 152834812 BLAKE2B 6be1d32b251daf99296ef0a980fabfd78555c8e6a6ae870bf3d1f978c1d36a494b2ac3f07dc9887a2597768c15bdc3a9489f5208a50beb32bd65eed8372d6b28 SHA512 25e9f0716293fcd8e0338cd23b6d7101b288bf9c1cac7d312c2f14910349180f4c8e6697d6641c4c05d15418df0ea907970cdb5282ca2a741d53e6ec949e60c4
+DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0_rc1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0_rc1.ebuild
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,2 +1,2 @@
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
-DIST vbox-kernel-module-src-6.0.0_rc1.tar.xz 665952 BLAKE2B 1e6b1727057081aeb1e56f17ce1b6652f305094a93943b2ca296e2ac9fab1ef4a2f3fead63ba65c439ed36f3654367b09e3b7fecef8534ae59586fe0639aafe2 SHA512 4a83de795d783a89b12f415be8315a632c0323568adc149015568d56f924414278c629203967cabe29504428baf8fe6181889c42e2ffe7b0bb2bdd855dddd090
+DIST vbox-kernel-module-src-6.0.0.tar.xz 666352 BLAKE2B 51309dd9fddb1e26e8fce55bae018d96569a28ce1d6850e2b13b47829d0336671d23962191ff4eda0f846c073a94a1d30fa67bb5e5b73f1fda63b6f06acc1225 SHA512 c0c26f2544580e16c525db997a5a3b2cbe1b84b0418cf099d12c67bc72ff7c79b30fe74793d10c710db6a03640ccb5935fbb9df55c2d8aea435beafe0de94385
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.0_rc1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.0_rc1.ebuild
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,4 +1,4 @@
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
-DIST VirtualBox-6.0.0_RC1.tar.bz2 152834812 BLAKE2B 6be1d32b251daf99296ef0a980fabfd78555c8e6a6ae870bf3d1f978c1d36a494b2ac3f07dc9887a2597768c15bdc3a9489f5208a50beb32bd65eed8372d6b28 SHA512 25e9f0716293fcd8e0338cd23b6d7101b288bf9c1cac7d312c2f14910349180f4c8e6697d6641c4c05d15418df0ea907970cdb5282ca2a741d53e6ec949e60c4
+DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
--- a/app-emulation/virtualbox/virtualbox-6.0.0_rc1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.0_rc1.ebuild
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@ -1 +1,2 @@
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
+DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
--- a/app-emulation/vkd3d/vkd3d-1.1.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
+fi
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
+		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}
+		dev-util/spirv-headers
+		dev-util/vulkan-headers"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_with spirv-tools)
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -1,7 +1,7 @@
 DIST elasticsearch-5.6.13.tar.gz 33894848 BLAKE2B d6b486154c4b4df155e443adee7d07200822f4a14f9cc50753e5b4621630c3b5de7b6b3d3ad7745b898f5a24c02aaddbec05aaf0f5d38fbda8acd78eed433939 SHA512 dbda463f0fba0b921ac65ca8743f53cb21410001cb6113aeaa2bfe3e22fbdac9f9010a3bdd2df5b8bc6c7cd59513d9fbac8b408d22d2b885ff5dadbb463b7981
 DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
 DIST elasticsearch-6.4.3.tar.gz 97872736 BLAKE2B e8c5db4f7238afccce4cf1ca0eced7b7e97891455cd28583eafd7ba028ba3cbc3596cedb2dc4267e677b3c7bbd459b8144284eca358f8c0e34a9a0b8a33426a8 SHA512 2f48720fd1644b1d0f103ca93bd19632c2a12bd3c94434ddf58bc692cb0b23631222f8d23cc0d0e85e271e11099fe0fc8aedf402906b76845ad680eb592f8987
-DIST elasticsearch-6.5.2.tar.gz 113320120 BLAKE2B 4e1783890ea146d1a484e549c66d003c71bfd1977aae56de6e2b14322d776570b5c1061fbb3fa771aaaaadf86aab9421d76ba9fc591eea09fb67a506e7f9b3c9 SHA512 b7923d49abb5b5c62d020f75bf9152b8972e24001d31b7e59034c4469acb59cebe6efe1005e7f2c983d4cb02dd1588cf7735146e56aa101f20a8f8c772862957
+DIST elasticsearch-6.5.4.tar.gz 113322649 BLAKE2B 876dd23f80e24390e4efa1aeca6fa5791e3320a292d60d1b7628c685d1a3210f8ab15b78013ccbad5e589bf65fc05153ee810a1113d6ab9b2bfe62a335887302 SHA512 dcd6afdac02cdacdd4bbb3d9f73bffeb7a93750b35f5a5a991dae6c7d9f8883e33401ddf3096346e008047bfcf08d09435ea5f0290e717ff3a041600ea088584
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
-DIST elasticsearch-oss-6.5.2.tar.gz 34263400 BLAKE2B 30d30d173aaccf2c70c3cf7a2cb14de8c38358dba9affe31452b3a42f48fdcec6ff7484909d4bc68a93360367d04a226df95b3ebe868c22c86934f0ce78bc865 SHA512 45eb22f94da4d048f0a5ef7cb0ae402af10b7fb2bb7d79a520865524ef52f0e2e5e2295ec3970a1d34f496bab729e1bfd6ba753c323ff82d165902bb81bddb69
+DIST elasticsearch-oss-6.5.4.tar.gz 34267092 BLAKE2B 18a35c4556a93d953665c1b740265c539e9f7f2232070a2ee9a0419f3c4b09748f8661bb53c5c785b4a26b001060a8b8bf96f4fc50af3a9252380e89623c9253 SHA512 1835aa2862104d328deb5bfcdbbab5d121cd8dff883b7f56f14cc4dadb88c7560b688ac21fb51e0d086b6ed07e0345f26de91c2887253b40abf23c4d5e37e197
--- a/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild
--- a/app-misc/oneko/metadata.xml
+++ b/app-misc/oneko/metadata.xml
@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<longdescription lang='en'>
+"oneko-sakura" is modified version of oneko. KINOMOTO Sakura chases around your
+mouse cursor.
+
+To stop the program, run this command:
+
+killall oneko
+
+If your mouse cursor changes to the default black cross after running oneko,
+you should install x11-apps/xsetroot and run:
+
+	xsetroot -cursor_name left_ptr
+</longdescription>
 </pkgmetadata>
--- a/app-misc/oneko/oneko-1.2_p5.ebuild
+++ b/app-misc/oneko/oneko-1.2_p5.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="
+	${HOMEPAGE}distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz
+	mirror://gentoo/${P/_p*}-cat.png
+	mirror://gentoo/${P/_p*}-dog.png
+	mirror://gentoo/${P/_p*}-sakura-nobsd.patch.bz2
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/gccmakedep
+	x11-misc/imake
+"
+PATCHES=(
+	"${WORKDIR}"/${P/_p*}-sakura-nobsd.patch
+	"${FILESDIR}"/${P/_p*}-include.patch
+)
+S=${WORKDIR}/${P/_*}.sakura.${PV/*_p}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin oneko
+	newman oneko._man oneko.1x
+	dodoc README README-NEW README-SUPP
+
+	newicon "${DISTDIR}/${P/_*}-cat.png" "cat.png"
+	newicon "${DISTDIR}/${P/_*}-dog.png" "dog.png"
+
+	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@ -1,4 +1,4 @@
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
-DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2
 DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
+DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.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"
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@ -3,3 +3,4 @@ DIST bashdb-4.4-0.92.tar.bz2 678961 BLAKE2B a47e964653238452fcad6f4e098df64de4d2
 DIST bashdb-4.4-0.94.tar.bz2 810610 BLAKE2B fa3a68349b0ab64e17c094c34b82c8ba054a86f83452bab50a55bc9f63181459fd49a7a39e2e7a7c66063ac291b8f2a03d4ba6b834a3d5869d2fe9b099f4eb2b SHA512 97e7d057f16d90d7f1677e1b29d2467d5ee263e9aaad64e2d7a8b8a19b3f3ca68023f23a45faea235fdba57e803fae762a19aab67f650b81e868a8a01c5b1fb7
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-4.4-1.0.0.tar.bz2 701749 BLAKE2B 2fa4bfd21f6c646c6bb1c2439dfed870478fb985dd52c8ba716e08fa0312da9adb0c29396594280bce525bb88f15b7398878c7a9bb2a39c078d4e5f17706c20a SHA512 eae45eb221c662e6bbf86814b861992944fcdef221e1bbc7df6c4fd0197022b82fabf4b7e5d583ba4fff94a0b486f71901d42f9df12a8b6a5f564e9236ad37e5
+DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
--- a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
+++ b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${PN}-${PV:0:3}-${PV:4}"
+DESCRIPTION="bash source code debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2
+	test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use test ; then
+		einfo "Copying missing files ..."
+		# https://sourceforge.net/p/bashdb/bugs/52/
+		cp -vafn "${WORKDIR}"/missing-files/* "${S}"/test || die
+	fi
+
+	default
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+src_configure() {
+	# This path matches the bash sources.  If we ever change bash,
+	# we'll probably have to change this to match.  #591994
+	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
+}
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.2.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/calibre/calibre-3.35.0.ebuild
+++ b/app-text/calibre/calibre-3.35.0.ebuild
@ -199,11 +199,7 @@ src_install() {
 	local libdir=$(get_libdir)
 	[[ -n $libdir ]] || die "get_libdir returned an empty string"

-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
+	addpredict /dev/dri #665310

 	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
 	#dodir $(python_get_sitedir)
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@ -1 +1,2 @@
 DIST cpdf-2.1.1.tar.gz 349536 BLAKE2B 4064605890745ebaa24d32c3294a3293312dc8df6ab3989e1a7417989cdb19aca6b70faafb258c7c00d6febeba8b17379396c1f90628e72be0791cdefc579b6f SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517
+DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
--- a/app-text/cpdf/cpdf-2.2.1.ebuild
+++ b/app-text/cpdf/cpdf-2.2.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# BSD is only for xmlm.ml
+LICENSE="Coherent-Graphics BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
+	dev-ml/camlpdf:="
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}-source-${PV}
+
+src_compile() {
+	# parallel make issues
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+
+	dobin cpdf
+	dodoc Changes README.md cpdfmanual.pdf
+	doman cpdf.1
+
+	use doc && dodoc -r doc/cpdf/html
+}
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@ -1 +1,2 @@
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
+DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
--- a/app-text/llpp/files/Makefile
+++ b/app-text/llpp/files/Makefile
@ -0,0 +1,91 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "$(VERSION)" ""
+VERSION = 28
+endif
+
+# paths
+PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
+C_OBJ = $(C_SRC:.c=.o)
+OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
+OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += $(wildcard *.sh) KEYS README BUILDING
+DISTFILES += misc/ adoc/
+
+all: llpp $(MANS)
+
+# dependency ordering
+config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
+confstruct.cmx: wsi.cmx utils.cmx
+ffi.cmx: config.cmx
+glutils.cmx: ffi.cmx
+help.cmx: help.cmi config.cmx utils.cmx
+listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
+main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
+main.cmx: CAMLFLAGS += -thread
+parser.cmx: utils.cmx
+wsi.cmi: utils.cmx keys.cmx
+wsi.cmx: wsi.cmi
+
+link.o: glfont.c
+version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: $(OCAML_OBJ) $(C_OBJ)
+	$(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
+
+
+confstruct.ml: genconfstr.sh
+	sh $< >$@
+
+# pattern rules
+%.o: %.c
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.cmi: %.mli
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.1: %.adoc adoc/asciidoc.conf
+	a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $<
+
+# special targets
+clean:
+	$(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+dist: clean
+	mkdir llpp-$(VERSION)
+	cp -r $(DISTFILES) llpp-$(VERSION)
+	tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+	rm -rf llpp-$(VERSION)
+
+install:
+	install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
+	install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1  $(MANS)
+	install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
+	install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
+	install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
+	install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
+
+.PHONY: all clean dist install
--- a/app-text/llpp/files/llpp-30-keysym.patch
+++ b/app-text/llpp/files/llpp-30-keysym.patch
@ -0,0 +1,55 @@
+From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 5 Jun 2018 11:56:06 -0400
+Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
+
+Source code, e.g. #include, belongs in the source code, not the build
+system. Build systems are for defining include paths, not the includes
+themselves.
+
+Drop the KeySym keyword since it seems to be a useless alias for
+uint32_t which might as well be used directly instead of indirectly
+using #define everywhere.
+---
+ link.c               | 4 ++--
+ wsi/x11/keysym2ucs.c | 4 +++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/link.c b/link.c
+index 783b12f..e8dcac3 100644
+--- a/link.c
+++ b/link.c
+@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
+ {
+     CAMLparam1 (keysym_v);
+     CAMLlocal1 (str_v);
+-    KeySym keysym = Int_val (keysym_v);
+    uint32_t keysym = Int_val (keysym_v);
+     Rune rune;
+-    extern long keysym2ucs (KeySym);
+    extern long keysym2ucs (uint32_t);
+     int len;
+     char buf[5];
+ 
+diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
+index 38f9f1f..0f907c2 100644
+--- a/wsi/x11/keysym2ucs.c
+++ b/wsi/x11/keysym2ucs.c
+@@ -37,6 +37,8 @@
+  * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
+  */
+ 
+#include <inttypes.h>
+
+ struct codepair {
+   unsigned short keysym;
+   unsigned short ucs;
+@@ -816,7 +818,7 @@ struct codepair {
+   { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
+ };
+ 
+-long keysym2ucs(KeySym keysym)
+long keysym2ucs(uint32_t keysym)
+ {
+     int min = 0;
+     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
--- a/app-text/llpp/files/llpp.desktop
+++ b/app-text/llpp/files/llpp.desktop
@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=llpp
+GenericName=PDF Pager
+Exec=llpp %f
+TryExec=llpp
+Terminal=false
+Type=Application
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;image/png;
+Categories=Office;Viewer;Graphics
+Actions=View
+Version=1.0
+[Desktop Action View]
+Name=View with llpp
+Exec=llpp %f
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/fontconfig:1.0[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND}
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	>=dev-lang/ocaml-4.02[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${P}-keysym.patch )
+
+src_prepare() {
+	default
+
+	# use custom makefile from archlinux with minor changes
+	cp "${FILESDIR}"/Makefile "${S}" || die
+
+	# re-add desktop file removed upstream
+	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@ -1,2 +1 @@
-DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs readme.gentoo-r1 xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-
-	FORCE_PRINT_ELOG=1
-	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-		app-arch/unzip for additional file support."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@ -1,2 +1 @@
-DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/djvu-3.5.24-r1:=
-	>=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@ -1,2 +1 @@
-DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@ -5,17 +5,17 @@
 		<name>Mikle Kolyada</name>
 		<email>zlogene@gentoo.org</email>
 	</maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<upstream>
+		<maintainer status="active">
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
+		</maintainer>
+			<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-1.12.0:=
-	>=app-text/zathura-0.3.8
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
-		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
-		OPENSSL_LIB=''
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@ -1,2 +1 @@
-DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
 DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.8
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@ -1,2 +1 @@
-DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/libspectre-0.2.6:=
-	>=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@ -1,2 +1 @@
-DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
 DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs virtualx xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic sqlite synctex test"
-
-RDEPEND=">=dev-libs/girara-0.2.8:=
-	>=dev-libs/glib-2.32:2=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.6:3
-	magic? ( sys-apps/file:= )
-	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( >=app-text/texlive-core-2015 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_configure() {
-	myzathuraconf=(
-		WITH_MAGIC=$(usex magic 1 0)
-		WITH_SQLITE=$(usex sqlite 1 0)
-		WITH_SYNCTEX=$(usex synctex 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_test() {
-	virtx emake "${myzathuraconf[@]}" test
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-text/zathura/zathura-0.4.1-r2.ebuild
+++ b/app-text/zathura/zathura-0.4.1-r2.ebuild
@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
 RDEPEND=">=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2
 	dev-python/sphinx
+	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@ -24,6 +24,7 @@ IUSE="+magic seccomp sqlite synctex test"
 RDEPEND=">=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2
 	dev-python/sphinx
+	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@ -1 +1,2 @@
+DIST airline-0.10.tar.gz 86724 BLAKE2B b0019b07b188039a9a91d83bc240e6b2eedaf9d798483f03d252b57269c0cbbc58625b3d14e36a3caaa6fd35b65716d67a967a38511806d76bc7e76192086349 SHA512 94c87800b793d575d8e1fbf2971cc97e89aae4a6bd9581aee628d4e4f2d9e74df427fcc91b17908819b5f4793c72a9d0a827d5046d80918a52ef8e090ff2cae6
 DIST airline-0.9.tar.gz 72660 BLAKE2B d6c9762d8140b2a88a001b9ea3ae62c3c9147ccf3db90146d7fded8dcbc6062bf97c0725baa79db9d7bfe0eeaa5dc00ddfabde8ed1b9aec7f5aa24c41b11d1f2 SHA512 f3fd03c7ab6603eee6e892a1b88888d72fc43cf0a8582ad7e65152cddebb0d14be3a805529fa5467fc82e040cce2616f1693bf294c892c0849d9fb51cbbd04ec
--- a/app-vim/airline/airline-0.10.ebuild
+++ b/app-vim/airline/airline-0.10.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+	MY_PN=vim-${PN}
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm -r t Gemfile Rakefile LICENSE README* || die
+}
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit vim-plugin

--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@ -1,2 +1,3 @@
 DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100
 DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde45c9c310eab87f0aa20da90e46dd67359e669f8b36477339df7bd7c8bd8eb18baaf0f1a779372ec3623c50aca SHA512 740ed41862c1e422a751b205513754e9c7bd04cc8ad4e3b08e2ccd1c1d30dea43a90896bc8eecd0cb4253b4adf803a814ddd48d6166fb5a53f507cf3e6940a38
+DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED="test"
+inherit cmake-utils cuda fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc[sparse]
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		virtual/opengl
+		virtual/pkgconfig
+		cuda? ( dev-util/nvidia-cuda-toolkit )
+	)
+"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+src_unpack() {
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
+	sed -e "/add_subdirectory(demos/d" \
+		-i CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/add_subdirectory(test/d" \
+			-i CMakeLists.txt || die
+
+		sed -e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			-i CMakeLists.txt || die
+	fi
+	sed -e "/Unknown build type/d" \
+		-i CMakeLists.txt || die
+
+	use cuda && cuda_src_prepare
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DEIGEN_TEST_NOQT=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_CXX11="$(usex c++11)"
+		-DEIGEN_TEST_CUDA="$(usex cuda)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_NEON64="$(usex neon)"
+	)
+	cmake-utils_src_configure
+	cmake-utils_src_compile blas
+	cmake-utils_src_compile buildtests
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake-utils_src_install
+
+	# Debian installs it and some projects started using it.
+	insinto /usr/share/cmake/Modules/
+	doins "${S}/cmake/FindEigen3.cmake"
+}
--- 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/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@ -1,2 +1,3 @@
 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69
+DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
--- a/dev-lang/tcl/tcl-8.5.17.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17.ebuild
@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs

-MY_P="${PN}${PV/_beta/b}"
+MY_P="${PN}${PV}"

 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"

 LICENSE="tcltk"
-SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 +threads"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@ -22,11 +22,20 @@ DEPEND="${RDEPEND}"
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix

-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+)

-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die

 	# workaround stack check issues, bug #280934
 	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
@ -37,7 +46,14 @@ src_prepare() {
 		-e '/chmod/s:555:755:g' \
 		-i Makefile.in || die

+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
 	eautoconf
+
 	multilib_copy_sources
 }

@ -57,11 +73,10 @@ multilib_src_configure() {

 multilib_src_install() {
 	#short version number
-	local v1=$(get_version_component_range 1-2)
+	local v1=$(ver_cut 1-2)
 	local mylibdir=$(get_libdir)

 	S= default
-
 	# fix the tclConfig.sh to eliminate refs to the build directory
 	# and drop unnecessary -L inclusion to default system libdir

@ -72,7 +87,7 @@ multilib_src_install() {
 		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
 		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
 		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
 		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed \
@ -100,7 +115,7 @@ multilib_src_install() {

 pkg_postinst() {
 	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.5 ${version}; then
+		if ver_test 8.6 -lt ${version}; then
 			echo
 			ewarn "You're upgrading from <${P}, you must recompile the other"
 			ewarn "packages on your system that link with tcl after the upgrade"
--- a/dev-lang/tk/tk-8.5.17.ebuild
+++ b/dev-lang/tk/tk-8.5.17.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 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="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	~dev-lang/tcl-${PV}:0="
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm -f configure || die
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	tc-export CC
-
-	eautoconf
-}
-
-src_configure() {
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_test() {
-	Xemake test
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/efl/efl-1.20.7-r2.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r2.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
@ -17,6 +17,7 @@ IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig f
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
--- a/dev-libs/efl/efl-1.21.1-r2.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r2.ebuild
@ -17,6 +17,7 @@ IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@ -1,2 +1 @@
-DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="https://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="libnotify static-libs test"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.4:3
-	dev-libs/json-c
-	!<${CATEGORY}/${PN}-0.1.6
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( x11-apps/xhost
-		dev-libs/check )"
-
-pkg_setup() {
-	mygiraraconf=(
-		WITH_LIBNOTIFY=$(usex libnotify 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-		)
-}
-
-src_prepare() {
-	# Remove 'static' and 'install-static' targets
-	if ! use static-libs; then
-		sed -i \
-			-e '/^${PROJECT}:/s:static::' \
-			-e '/^install:/s:install-static::' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	emake "${mygiraraconf[@]}"
-}
-
-src_test() {
-	virtx default
-}
-
-src_install() {
-	emake "${mygiraraconf[@]}" install
-	dodoc AUTHORS
-}
--- a/dev-libs/glib/glib-2.56.4.ebuild
+++ b/dev-libs/glib/glib-2.56.4.ebuild
@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
--- a/dev-libs/libbson/libbson-1.13.0.ebuild
+++ b/dev-libs/libbson/libbson-1.13.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=7
@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
 IUSE="examples static-libs"

 DEPEND="dev-python/sphinx"
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.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,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE="debug examples static-libs"

 src_configure() {
--- a/Show more
+++ b/Show more