Sync with portage [Tue Feb 26 08:42:31 MSK 2019].

app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch

@@ -1,17 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,13 +2,10 @@
- 
- #CC      = gcc
- PROF    = -g0 -O2
--CFLAGS  = $(PROF) -Wall
--LDFLAGS = $(PROF)
-+CFLAGS += -Wall
- TARGET  = ide-smart
- OBJECTS = ide-smart.o
- 		
--ide-smart: $(OBJECTS)
--	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
- 
- all: ide-smart
- 

app-admin/restart-services/Manifest

@@ -1,2 +1,3 @@
+DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
 DIST restart-services-0.14.2.tgz 21227 BLAKE2B 9a3f03bbd1995df6f583f8c4228914f098922828b1407c0c8069908ebdbef67599a8a7421b0c404adf2d330632ae83646300a965c514f6746bbd95674ab102ea SHA512 487e8d0a448954be7b79d1c95bffd00d5f875ccb908b8004e18e45752e593fe57713f97c0749e28367bf7606c5cf46556f31de6b018a151f7cd384c88277ca7c
 DIST restart-services-0.14.3.tgz 21377 BLAKE2B f99331d66f174a68134722bf00b854d68f2b1deb492c6c6db0f17974dc14b28df1ce3a8669fe42a5085f64216e19003c02e364dcd1a75428060c9ef7ba176f86 SHA512 9c4b9d68db303548957b533edba58635a7bb97149f0cc2e1e270b399c860ff0b42a257a61d9c9b0d45c1704241d0cefda72e7411b9c29f9f80cf159b37908eb1

app-admin/restart-services/restart-services-0.14.1.ebuild

@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	# remove after 2018/07/01
+	dosym restart-services /usr/sbin/restart_services
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Migrating config"
+			if [[ -e /etc/restart-services.d ]]; then
+				ewarn "/etc/restart-services.d already exists?!"
+				return
+			fi
+			if [[ -e /etc/restart-services.conf ]]; then
+				ewarn "/etc/restart-services.conf already exists?!"
+				return
+			fi
+
+			if [[ -f /etc/restart_services.d/00-local.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.d/00-local.conf
+			fi
+			if [[ $(ls /etc/restart_services.d/) ]]; then
+				mv -v /etc/restart_services.d/* /etc/restart-services.d/
+			fi
+			if [[ -f /etc/restart_services.d/.keep_app-admin_restart_services-0 ]]; then
+				rm -v /etc/restart_services.d/.keep_app-admin_restart_services-0
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				rmdir -v /etc/restart_services.d
+			fi
+
+			if [[ -f /etc/restart_services.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.conf
+				mv /etc/restart_services.conf /etc/restart-services.conf
+			fi
+			einfo "done"
+		fi
+	fi
+}

app-admin/tmpreaper/tmpreaper-1.6.14.ebuild

@@ -31,7 +31,7 @@ src_install() {
 	exeinto /etc/cron.daily
 	newexe debian/cron.daily tmpreaper
 	doman debian/tmpreaper.conf.5
-	dodoc README ChangeLog debian/README*
+	dodoc README debian/changelog debian/README*
 }
 
 pkg_postinst() {

app-arch/afio/afio-2.5.1-r2.ebuild

@@ -10,7 +10,7 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch

app-arch/dpkg/Manifest

@@ -1,3 +1,4 @@
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
 DIST dpkg_1.19.3.tar.xz 4644312 BLAKE2B 42a906c5603cc36e53591d0f33c54930fcb0f0848b53cd1908ff5c018f3a4ab823c71408982247f61e0810f223124853fc181994853f39786563ddbf6228ba54 SHA512 6a53b68bc51b9c700618ad379d4f314f0058479d068ae7bb842388e57b6393f87c4990c1d71ed085e76314d0e29295a5344a0ea78f62ef8657df2d53124bbe8f
 DIST dpkg_1.19.4.tar.xz 4645784 BLAKE2B 2c8a76686ece182b7c87b1fcf3ed81a7bbc9616475e2003847fe9a35b574a814873b183ab5984bb66f725a8e92f3a000bf9250f3f9d1e6b338f6620b3011a067 SHA512 e07538bac0645bf7d49b30f4fb3b59602f304f346437faaea6b4bffbeb59f05471c5e834d6c7e98c869e5466a66c39a0d9e9c05da1cc52a10b5fc60875be218e
+DIST dpkg_1.19.5.tar.xz 4699096 BLAKE2B e627843d5502b0b1f3341f407e6ea3689b010afb5113774a133376da8a753b0f768197eeb306a0f8e84184a5110d1ad7695e0d1850b8f3254c5ad2b06d6e8e66 SHA512 3eec957534b8bcbce0e0e04992d29bb9340661bd6b2e29e155c657ce57364e0cb82be1fa61677bdcdb16915a245c37ee0fa64cdf08e39052bba2ca4aadf96b51

app-arch/dpkg/dpkg-1.19.5.ebuild

@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	use nls && strip-linguas -i po
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
+
+	prune_libtool_files
+}

app-crypt/openpgp-keys-gentoo-release/Manifest

@@ -1,4 +1,6 @@
 DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
+DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
 DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
 DIST gentoo-release.asc.20190223.gz 50407 BLAKE2B 6e3788da555fbb012c76ad174ddf6d0fd034c522b466b58c12e52eef5c900824724e32c51b53c7f7b542cca43073d1ab02ebcb7fc7560f0ff8c384cb47ee2fcc SHA512 3d71a91ae889ee1d237003f017d1cb7aec9129a9bcc9aa9cf2256656a88aaf96048c308994eda0b9f6b6fc2041fdb81cf91eb31d0b1ab7b380fe692b43e70d62
+DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67

app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190224.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+src_test() {
+	local old_umask=$(umask)
+	umask 077
+
+	local -x GNUPGHOME=${T}/.gnupg
+	mkdir "${GNUPGHOME}" || die
+	einfo "Importing keys ..."
+	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+	local f
+	for f in gentoo-release-test-sigs*/*.asc; do
+		einfo "Testing ${f##*/} ..."
+		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+	done
+
+	umask "${old_umask}"
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}

app-crypt/qca/qca-2.2.0_pre20180606.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils qmake-utils
 
@@ -15,6 +15,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	botan? ( dev-libs/botan:= )
@@ -33,7 +36,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	test? (
 		dev-qt/qtnetwork:5
 		dev-qt/qttest:5

app-editors/fte/files/fte-cpp14.patch

@@ -1,17 +0,0 @@
-Fix C++14 compilation errors. Add casting int literals to char in config
-generator to avoid narrowing conversions.
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=595048
-
---- a/src/mkdefcfg.pl
-+++ b/src/mkdefcfg.pl
-@@ -24,8 +24,8 @@
- 
-     @c = split(//, $buf);
-     for ($i = 0; $i < $len; $i++) {
--        $out .= sprintf("0x%02X", ord($c[$i]));
--        if ($n++ % 10) {
-+        $out .= sprintf("(char)0x%02X", ord($c[$i]));
-+        if ($n++ % 5) {
-             $out .= ", ";
-         } else {
-             $out .= ",\n";

app-editors/fte/files/fte-gcc34

@@ -1,38 +0,0 @@
---- fte/src/con_slang.cpp	2003-02-16 19:23:58.000000000 +0100
-+++ fte-gcc34/src/con_slang.cpp	2005-01-12 16:57:38.050369064 +0100
-@@ -246,7 +246,7 @@
-     SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs));
- 
-     SLsmg_gotorc(0, 0);
--    SLsmg_read_raw(linebuf, sizeof(slang_dchs));
-+    SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs));
-     for (i = 0; i < sizeof(slang_dchs); i++)
- 	raw_dchs[i] = (linebuf[i]) & 0xff;
- 
-@@ -368,7 +368,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_write_raw(box, W);
-+	SLsmg_write_raw((SLsmg_Char_Type*)box, W);
- 	box += W;
- 	H--;
-     }
-@@ -386,7 +386,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw(Cell, W);
-+	SLsmg_read_raw((SLsmg_Char_Type*)Cell, W);
- 	for (i = 0; i < W; i++)
- 	    if (Cell[i] & 0x8000) {
- 		ch = Cell[i] & 0xff;
-@@ -409,7 +409,7 @@
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw(box, W);
-+	SLsmg_read_raw((SLsmg_Char_Type*)box, W);
- 	box += W;
- 	H--;
-     }

app-editors/fte/files/fte-interix.patch

@@ -1,38 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3554646&group_id=943&atid=100943
-
-diff -ru fte.orig/src/g_unix_pipe.cpp fte/src/g_unix_pipe.cpp
---- fte.orig/src/g_unix_pipe.cpp	2008-04-03 13:33:49 +0200
-+++ fte/src/g_unix_pipe.cpp	2008-04-03 13:34:20 +0200
-@@ -4,6 +4,10 @@
- #include <signal.h>
- #include <sys/wait.h>
- 
-+#ifdef __INTERIX
-+# include <sys/time.h>
-+#endif
-+
- #include "sysdep.h"
- #include "c_config.h"
- #include "console.h"
-diff -ru fte.orig/src/sysdep.h fte/src/sysdep.h
---- fte.orig/src/sysdep.h	2008-04-03 13:33:58 +0200
-+++ fte/src/sysdep.h	2008-04-03 13:30:43 +0200
-@@ -15,7 +15,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
--#if defined(AIX) || defined(SCO) || defined(NCR)
-+#if defined(AIX) || defined(SCO) || defined(NCR) || defined(__INTERIX)
- #include <strings.h>
- #endif
- #include <stdio.h>
-@@ -38,7 +38,8 @@
-     !defined(IRIX) && \
-     !defined(SCO) && \
-     !defined(SUNOS) && \
--    !defined(NCR)
-+    !defined(NCR) && \
-+	!defined(__INTERIX)
- #    error Target not supported.
- #endif
- 

app-editors/fte/files/fte-new_keyword.patch

@@ -1,14 +0,0 @@
---- src/con_linux.cpp.orig	2005-01-30 22:46:54.170485296 +0300
-+++ src/con_linux.cpp	2005-01-30 22:46:28.859333176 +0300
-@@ -50,7 +50,11 @@
- #include <linux/major.h>
- #include <linux/kdev_t.h>
- #include <linux/kd.h>
-+extern "C" {
-+#define new xnew
- #include <linux/keyboard.h>
-+#undef new
-+}
- #ifdef USE_GPM
- extern "C" {
- #include <gpm.h>

app-editors/fte/files/fte-slang.patch

@@ -1,131 +0,0 @@
-diff -Nru /tmp/wgHyQebD7F/fte-0.50.0/src/con_slang.cpp /tmp/PQJo4szkUb/fte-0.50.0/src/con_slang.cpp
---- a/fte-0.50.0/src/con_slang.cpp	2005-12-28 16:53:24.000000000 +0100
-+++ b/fte-0.50.0/src/con_slang.cpp	2006-06-05 06:02:37.000000000 +0200
-@@ -99,12 +99,14 @@
-     '+'
- };
- 
--static char raw_dchs[sizeof(slang_dchs)];
-+static SLsmg_Char_Type raw_dchs[sizeof(slang_dchs)];
- 
--static unsigned char ftesl_get_dch(char raw)
-+static unsigned char ftesl_get_dch(SLsmg_Char_Type raw)
- {
-     for (int i = 0; i < (int) sizeof(slang_dchs); i++)
--	if (raw_dchs[i] == raw)
-+	if (raw_dchs[i].nchars == raw.nchars
-+	    && !memcmp(raw_dchs[i].wchars, raw.wchars,
-+		       raw.nchars * sizeof(*raw.wchars)))
- 	    return DCH_SLANG_C1 + i;
-     return DCH_SLANG_EOL;
- }
-@@ -215,7 +217,6 @@
- int ConInit(int /*XSize */ , int /*YSize */ )
- {
-     unsigned i;
--    unsigned short linebuf[sizeof(slang_dchs)];
- 
-     SLtt_get_terminfo();
- 
-@@ -246,9 +247,7 @@
-     SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs));
- 
-     SLsmg_gotorc(0, 0);
--    SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs));
--    for (i = 0; i < sizeof(slang_dchs); i++)
--	raw_dchs[i] = (linebuf[i]) & 0xff;
-+    SLsmg_read_raw(raw_dchs, sizeof(slang_dchs));
- 
-     SLsmg_set_char_set(0);
- 
-@@ -361,14 +360,14 @@
-     return 0;
- }
- 
--static int ConPutBoxRaw(int X, int Y, int W, int H, unsigned short *box)
-+static int ConPutBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box)
- {
-     int CurX, CurY;
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_write_raw((SLsmg_Char_Type*)box, W);
-+	SLsmg_write_raw(box, W);
- 	box += W;
- 	H--;
-     }
-@@ -381,35 +380,51 @@
- int ConGetBox(int X, int Y, int W, int H, PCell Cell)
- {
-     int CurX, CurY, i;
--    char ch;
-+    SLsmg_Char_Type *linebuf;
-+
-+    linebuf = new SLsmg_Char_Type [W];
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw((SLsmg_Char_Type*)Cell, W);
--	for (i = 0; i < W; i++)
--	    if (Cell[i] & 0x8000) {
--		ch = Cell[i] & 0xff;
--		Cell[i] &= 0x7f00;
--		Cell[i] |= ftesl_get_dch(ch);
--	    }
-+	SLsmg_read_raw(linebuf, W);
-+	for (i = 0; i < W; i++) {
-+	    if (linebuf[i].color & SLSMG_ACS_MASK)
-+		Cell[i] = ftesl_get_dch(linebuf[i]);
-+	    else
-+		/*
-+		 * FIXME: Handle UTF-8 -- way beyond a quick-and-dirty
-+		 * fix.  --MV
-+		 */
-+		Cell[i] = SLSMG_EXTRACT_CHAR(linebuf[i]);
-+	    /*
-+	     * FIXME: This preserves only 7 out of 15 bits of color.
-+	     * Fortunately, we're dealing with color handles rather than
-+	     * colors themselves -- S-Lang jumps through an extra hoop to
-+	     * map these to color data.  As long as we use less than 127
-+	     * different colors, things should be OK.  I think.  --MV
-+	     */
-+	    Cell[i] |= (linebuf[i].color & 0x7f) << 8;
-+	}
- 	Cell += W;
- 	H--;
-     }
-     ConSetCursorPos(CurX, CurY);
- 
-+    delete [] (linebuf);
-+
-     return 0;
- 
- }
- 
--static int ConGetBoxRaw(int X, int Y, int W, int H, unsigned short *box)
-+static int ConGetBoxRaw(int X, int Y, int W, int H, SLsmg_Char_Type *box)
- {
-     int CurX, CurY;
- 
-     ConQueryCursorPos(&CurX, &CurY);
-     while (H > 0) {
- 	SLsmg_gotorc(Y++, X);
--	SLsmg_read_raw((SLsmg_Char_Type*)box, W);
-+	SLsmg_read_raw(box, W);
- 	box += W;
- 	H--;
-     }
-@@ -451,9 +466,9 @@
- 
- int ConScroll(int Way, int X, int Y, int W, int H, TAttr Fill, int Count)
- {
--    unsigned short *box;
-+    SLsmg_Char_Type *box;
- 
--    box = new unsigned short [W * H];
-+    box = new SLsmg_Char_Type [W * H];
- 
-     TCell fill = (((unsigned) Fill) << 8) | ' ';
- 

app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch

@@ -0,0 +1,25 @@
+From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 26 Feb 2019 00:47:26 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
+
+Downstream report: https://bugs.gentoo.org/668392
+---
+ src/ui/stats.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
+index 59837c9..e0f3cbd 100644
+--- a/src/ui/stats.cpp
++++ b/src/ui/stats.cpp
+@@ -3,6 +3,7 @@
+ #include <QNetworkAccessManager>
+ #include <QJsonDocument>
+ #include <QNetworkRequest>
++#include <QDateTime>
+ #include <QNetworkReply>
+ #include <QSysInfo>
+ #include <QTimer>
+-- 
+2.21.0
+

app-editors/notepadqq/notepadqq-1.4.8.ebuild

@@ -27,13 +27,12 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
 
 src_prepare() {
 	default

app-emacs/multi-term/Manifest

@@ -1 +1,2 @@
 DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361
+DIST multi-term-1.4.el.xz 7996 BLAKE2B fd9247d55b272c5238ae2344ecb7f516d0b3877f934ad35410ffaaa85d5d208a906cef2f2843240c672f916ce68dc210aa07c2330e9e485505c89d98c88a7d25 SHA512 113118fd352516cb1abf49536369361790786d570d347aab3faa1c672058d883e9ae8bba00a73f6ffc7487fc4166525e0c4af395888f09181dcc69d8aaba5f03

app-emacs/multi-term/multi-term-1.4.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Manage multiple terminal buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/MultiTerm"
+# Taken from http://www.emacswiki.org/emacs/download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"

app-forensics/afflib/afflib-3.7.18.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm hppa ppc x86 ~x64-macos"
 IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 

app-i18n/ibus/Manifest

@@ -1,4 +1,2 @@
-DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
-DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc

app-i18n/ibus/files/ibus-1.5.19-vala-0.43.4.patch

@@ -0,0 +1,191 @@
+From 4d7c1e00e15921a0448947961183c1c124b6b49f Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Tue, 29 Jan 2019 17:57:16 +0900
+Subject: [PATCH] Delete weak pointer in GList.SList for vala 0.43.4
+
+Vala 0.43.4 does not allow to convert a weak pointer to the full one in SList.
+
+emojier.vala:424.36-425.73: error: Assignment: Cannot convert from
+`GLib.SList<weak IBus.EmojiData>' to `GLib.SList<IBus.EmojiData>?'
+emojier.vala:636.9-637.69: error: Assignment: Cannot convert from
+`GLib.SList<weak IBus.UnicodeBlock>' to `GLib.SList<IBus.UnicodeBlock>'
+panel.vala:526.36-526.65: error: Assignment: Cannot convert from
+`GLib.List<weak IBus.EngineDesc>' to `GLib.List<IBus.EngineDesc>?'
+---
+ src/ibusbus.h        | 11 ++++++-----
+ src/ibusemoji.h      |  6 +++---
+ src/ibusunicode.h    |  8 ++++----
+ ui/gtk3/emojier.vala | 24 ++++++++++++++++--------
+ 4 files changed, 29 insertions(+), 20 deletions(-)
+
+diff --git a/src/ibusbus.h b/src/ibusbus.h
+index dff3dfb7..fddcf5b2 100644
+--- a/src/ibusbus.h
++++ b/src/ibusbus.h
+@@ -2,7 +2,8 @@
+ /* vim:set et sts=4: */
+ /* ibus - The Input Bus
+  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
+- * Copyright (C) 2008-2013 Red Hat, Inc.
++ * Copyright (C) 2013-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2008-2019 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -692,7 +693,7 @@ gboolean     ibus_bus_register_component_async_finish
+  *
+  * List engines synchronously.
+  *
+- * Returns: (transfer container) (element-type IBusEngineDesc):
++ * Returns: (transfer full) (element-type IBusEngineDesc):
+  *         A List of engines.
+  */
+ GList       *ibus_bus_list_engines      (IBusBus        *bus);
+@@ -725,7 +726,7 @@ void         ibus_bus_list_engines_async
+  *
+  * Finishes an operation started with ibus_bus_list_engines_async().
+  *
+- * Returns: (transfer container) (element-type IBusEngineDesc):
++ * Returns: (transfer full) (element-type IBusEngineDesc):
+  *         A List of engines.
+  */
+ GList       *ibus_bus_list_engines_async_finish
+@@ -740,7 +741,7 @@ GList       *ibus_bus_list_engines_async_finish
+  *
+  * List active engines synchronously.
+  *
+- * Returns: (transfer container) (element-type IBusEngineDesc):
++ * Returns: (transfer full) (element-type IBusEngineDesc):
+  *        A List of active engines.
+  *
+  * Deprecated: 1.5.3: Read dconf value
+@@ -782,7 +783,7 @@ void         ibus_bus_list_active_engines_async
+  *
+  * Finishes an operation started with ibus_bus_list_active_engines_async().
+  *
+- * Returns: (transfer container) (element-type IBusEngineDesc):
++ * Returns: (transfer full) (element-type IBusEngineDesc):
+  *         A List of active engines.
+  *
+  * Deprecated: 1.5.3: Read dconf value
+diff --git a/src/ibusemoji.h b/src/ibusemoji.h
+index 4edee726..5e9fbcf4 100644
+--- a/src/ibusemoji.h
++++ b/src/ibusemoji.h
+@@ -1,8 +1,8 @@
+ /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+ /* vim:set et sts=4: */
+ /* bus - The Input Bus
+- * Copyright (C) 2017 Takao Fujiwara <takao.fujiwara1@gmail.com>
+- * Copyright (C) 2017 Red Hat, Inc.
++ * Copyright (C) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2017-2019 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -209,7 +209,7 @@ void            ibus_emoji_data_save            (const gchar    *path,
+  * ibus_emoji_data_load:
+  * @path: A path of the saved dictionary file.
+  *
+- * Returns: (element-type IBusEmojiData) (transfer container):
++ * Returns: (element-type IBusEmojiData) (transfer full):
+  * An #IBusEmojiData list loaded from the saved cache file.
+  */
+ GSList *        ibus_emoji_data_load            (const gchar    *path);
+diff --git a/src/ibusunicode.h b/src/ibusunicode.h
+index 99de9451..473bdb19 100644
+--- a/src/ibusunicode.h
++++ b/src/ibusunicode.h
+@@ -1,8 +1,8 @@
+ /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+ /* vim:set et sts=4: */
+ /* bus - The Input Bus
+- * Copyright (C) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+- * Copyright (C) 2018 Red Hat, Inc.
++ * Copyright (C) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (C) 2018-2019 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -201,7 +201,7 @@ void              ibus_unicode_data_save      (const gchar        *path,
+  *    #IBusUnicodeData, * the total number of #IBusUnicodeData) of uint values
+  *    with that signal by 100 times. Otherwise %NULL.
+  *
+- * Returns: (element-type IBusUnicodeData) (transfer container):
++ * Returns: (element-type IBusUnicodeData) (transfer full):
+  * An #IBusUnicodeData list loaded from the saved cache file.
+  */
+ GSList *          ibus_unicode_data_load      (const gchar        *path,
+@@ -290,7 +290,7 @@ void              ibus_unicode_block_save     (const gchar        *path,
+  * ibus_unicode_block_load:
+  * @path: A path of the saved dictionary file.
+  *
+- * Returns: (element-type IBusUnicodeBlock) (transfer container):
++ * Returns: (element-type IBusUnicodeBlock) (transfer full):
+  * An #IBusUnicodeBlock list loaded from the saved cache file.
+  */
+ GSList *          ibus_unicode_block_load     (const gchar        *path);
+diff --git a/ui/gtk3/emojier.vala b/ui/gtk3/emojier.vala
+index 0b9b54a9..aedeb4cb 100644
+--- a/ui/gtk3/emojier.vala
++++ b/ui/gtk3/emojier.vala
+@@ -2,7 +2,7 @@
+  *
+  * ibus - The Input Bus
+  *
+- * Copyright (c) 2017-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
++ * Copyright (c) 2017-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -882,8 +882,13 @@ public class IBusEmojier : Gtk.ApplicationWindow {
+             update_unicode_blocks();
+             return;
+         } else {
+-            unowned GLib.SList<unowned string> emojis =
+-                    m_category_to_emojis_dict.lookup(category);
++            // Use copy_deep() since vala 0.43.4 does not allow to assign
++            // a weak pointer to the full one in SList:
++            // emojier.vala:885.48-886.62: error: Assignment: Cannot convert
++            // from `GLib.SList<string>' to `GLib.SList<weak string>?'
++            GLib.SList<string> emojis =
++                    m_category_to_emojis_dict.lookup(category).copy_deep(
++                            GLib.strdup);
+             m_lookup_table.clear();
+             m_candidate_panel_mode = true;
+             foreach (unowned string emoji in emojis) {
+@@ -1547,8 +1552,8 @@ public class IBusEmojier : Gtk.ApplicationWindow {
+             m_vbox.add(widget);
+             widget.show_all();
+         }
+-        unowned GLib.SList<unowned string>? annotations =
+-                data.get_annotations();
++        GLib.SList<string> annotations =
++                data.get_annotations().copy_deep(GLib.strdup);
+         var buff = new GLib.StringBuilder();
+         int i = 0;
+         foreach (unowned string annotation in annotations) {
+@@ -2001,17 +2006,20 @@ public class IBusEmojier : Gtk.ApplicationWindow {
+                     ) as IBus.EmojiData;
+                 m_emoji_to_data_dict.insert(favorite, new_data);
+             } else {
+-                unowned GLib.SList<string> annotations = data.get_annotations();
++                GLib.SList<string> annotations =
++                        data.get_annotations().copy_deep(GLib.strdup);
+                 if (annotations.find_custom(annotation, GLib.strcmp) == null) {
+                     annotations.append(annotation);
+-                    data.set_annotations(annotations.copy());
++                    data.set_annotations(annotations.copy_deep(GLib.strdup));
+                 }
+             }
+             unowned GLib.SList<string> emojis =
+                     m_annotation_to_emojis_dict.lookup(annotation);
+             if (emojis.find_custom(favorite, GLib.strcmp) == null) {
+                 emojis.append(favorite);
+-                m_annotation_to_emojis_dict.replace(annotation, emojis.copy());
++                m_annotation_to_emojis_dict.replace(
++                        annotation,
++                        emojis.copy_deep(GLib.strdup));
+             }
+         }
+     }

app-i18n/ibus/ibus-1.5.12.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=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
-REQUIRED_USE="gtk2? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-	# fixed in 1.5.14+
-	sed -i "/def test_keymap/a\        self.skipTest('')" bindings/pygobject/test-override-ibus.py
-	sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
-	sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

app-i18n/ibus/ibus-1.5.16.ebuild

@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

app-i18n/ibus/ibus-1.5.19.ebuild

@@ -4,7 +4,6 @@
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.36"
 VALA_USE_DEPEND="vapigen"
 
 inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
@@ -74,7 +73,10 @@ DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
 	unicode? ( app-i18n/unicode-data )"
 
-PATCHES=( "${FILESDIR}"/${P}-gdk-wayland.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gdk-wayland.patch
+	"${FILESDIR}"/${P}-vala-0.43.4.patch
+)
 
 src_prepare() {
 	vala_src_prepare --ignore-use

app-i18n/libchewing/libchewing-0.5.1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}

app-i18n/libchewing/libchewing-9999.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 KEYWORDS=""
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}

app-i18n/libpinyin/Manifest

@@ -1,2 +1,3 @@
 DIST libpinyin-2.2.1.tar.gz 256262 BLAKE2B 4fc081aa42b07eb7d21277c95407eafbf618c9aaf0c6707893f212be70f51d43fe00f50d1b4758d857d0f8aed1e9c177d61d6ca912e776633e8179279f09fb2e SHA512 d323655419aaceda12d794ac25387a2e073e8c2372511913febd5b8049f9d1764a0011cd97b538bbfb14f5c248495a150cf7e3b9f4af21182941e5920f2d879f
+DIST libpinyin-2.2.2.tar.gz 256304 BLAKE2B 52dc7d8fb4836bfc23137ba96177d488bf425c4bce52ea68933fe873a4ec02e2d49ccfac5c6097b55ea676bed30e635fc9805c205892bba2fe6047d92e5b9ed7 SHA512 80d955bf7f9e85ea90f9469032507713b0e15290fb7cc91a471c8c5564e3c78d430c5fd1dc871693aa40688fb68f7a17f719defe107d1512c5bcefd290c56285
 DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1

app-i18n/libpinyin/libpinyin-2.2.2.ebuild

@@ -0,0 +1,61 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	sys-libs/db:="
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}

app-misc/mc/mc-4.8.22.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"

app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild

@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
-HOMEPAGE="http://www.compass.com/synaptics/"
-SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_compile() {
-	econf
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin tpconfig || die "dobin failed!"
-	dodoc README AUTHORS NEWS INSTALL
-	doinitd "${FILESDIR}"/tpconfig
-	newconfd "${FILESDIR}"/tpconfig.conf tpconfig
-}

app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild

@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
@@ -11,16 +10,14 @@ SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README AUTHORS NEWS INSTALL )
+KEYWORDS="amd64 x86"
 
 src_compile() {
-	econf
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
+	einstalldocs
 	dobin "${PN}"
 	doinitd "${FILESDIR}"/"${PN}"
 	newconfd "${FILESDIR}"/"${PN}.conf" "${PN}"

app-misc/tracker/Manifest

@@ -1,2 +1,2 @@
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0
+DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696

app-misc/tracker/files/2.1.7-glib-2.60-compat.patch

@@ -1,169 +0,0 @@
-From 43b10233d4cce38230c357d885662291d2e5e978 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iainl@gnome.org>
-Date: Mon, 11 Feb 2019 15:42:14 +0000
-Subject: [PATCH 4/5] libtracker-data: Don't rely on hash table iteration order
- being stable
-
-This is the same problem that was fixed by
-c58f7aa419e2c3a69fa7fe583a1fd5e0b9bd0839 on master. Instead of relying
-on hash table iteration being stable, pass the GVariantBuilder down and
-add directly to it in the right order.
-
-Forwarded: https://gitlab.gnome.org/GNOME/tracker/merge_requests/55
----
- .../tracker-sparql-pattern.vala               |  4 +--
- src/libtracker-data/tracker-sparql-query.vala | 31 ++++++++++++-------
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
-index e03ed6f16..033b138a5 100644
---- a/src/libtracker-data/tracker-sparql-pattern.vala
-+++ b/src/libtracker-data/tracker-sparql-pattern.vala
-@@ -542,7 +542,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = query.generate_bnodeid (get_last_string ().substring (1));
-+			result = query.generate_bnodeid (get_last_string ().substring (1), null);
- 		} else if (current () == SparqlTokenType.STRING_LITERAL1) {
- 			result = expression.parse_string_literal ();
- 		} else if (current () == SparqlTokenType.STRING_LITERAL2) {
-@@ -569,7 +569,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (current () == SparqlTokenType.OPEN_BRACKET) {
- 			next ();
- 
--			result = query.generate_bnodeid (null);
-+			result = query.generate_bnodeid (null, null);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
-index 7944e78e5..69a7e9eba 100644
---- a/src/libtracker-data/tracker-sparql-query.vala
-+++ b/src/libtracker-data/tracker-sparql-query.vala
-@@ -284,7 +284,7 @@ public class Tracker.Sparql.Query : Object {
- 			sha1, sha1.substring (8), sha1.substring (12), sha1.substring (16), sha1.substring (20));
- 	}
- 
--	internal string generate_bnodeid (string? user_bnodeid) {
-+	internal string generate_bnodeid (string? user_bnodeid, GLib.VariantBuilder? builder) {
- 		// user_bnodeid is NULL for anonymous nodes
- 		if (user_bnodeid == null) {
- 			return ":%d".printf (++bnodeid);
-@@ -310,6 +310,9 @@ public class Tracker.Sparql.Query : Object {
- 				}
- 
- 				blank_nodes.insert (user_bnodeid, uri);
-+
-+				if (builder != null)
-+					builder.add ("{ss}", user_bnodeid, uri);
- 			}
- 
- 			return uri;
-@@ -774,7 +777,7 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				solution.solution_index = i;
- 				set_location (delete_location);
--				parse_construct_triples_block (solution, UpdateType.DELETE);
-+				parse_construct_triples_block (solution, UpdateType.DELETE, null);
- 				data_update.update_buffer_might_flush ();
- 			}
- 
-@@ -790,16 +793,20 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				uuid_generate (base_uuid);
- 				blank_nodes = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free);
-+				if (update_blank_nodes != null)
-+					update_blank_nodes.open (new GLib.VariantType("a{ss}"));
-+
- 				solution.solution_index = i;
- 
- 				set_location (insert_location);
- 				parse_construct_triples_block (solution,
- 							       insert_is_update ?
- 							       UpdateType.UPDATE :
--							       UpdateType.INSERT);
-+							       UpdateType.INSERT,
-+							       update_blank_nodes);
- 
- 				if (blank && update_blank_nodes != null) {
--					update_blank_nodes.add_value (blank_nodes);
-+					update_blank_nodes.close ();
- 				}
- 
- 				data_update.update_buffer_might_flush ();
-@@ -870,7 +877,7 @@ public class Tracker.Sparql.Query : Object {
- 		}
- 	}
- 
--	private void parse_construct_triples_block (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
-+	private void parse_construct_triples_block (Solution var_value_map, UpdateType type, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		expect (SparqlTokenType.OPEN_BRACE);
- 
- 		while (current () != SparqlTokenType.CLOSE_BRACE) {
-@@ -878,7 +885,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 			if (accept (SparqlTokenType.GRAPH)) {
- 				var old_graph = current_graph;
--				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for graph");
-@@ -887,7 +894,7 @@ public class Tracker.Sparql.Query : Object {
- 				expect (SparqlTokenType.OPEN_BRACE);
- 
- 				while (current () != SparqlTokenType.CLOSE_BRACE) {
--					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 					if (is_null) {
- 						throw get_error ("'null' not supported for subject");
-@@ -906,7 +913,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 				optional (SparqlTokenType.DOT);
- 			} else {
--				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for subject");
-@@ -925,7 +932,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	bool anon_blank_node_open = false;
- 
--	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null) throws Sparql.Error, DateError {
-+	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		string result = "";
- 		is_null = false;
- 		if (current () == SparqlTokenType.VAR) {
-@@ -947,7 +954,7 @@ public class Tracker.Sparql.Query : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = generate_bnodeid (get_last_string ().substring (1));
-+			result = generate_bnodeid (get_last_string ().substring (1), builder);
- 		} else if (current () == SparqlTokenType.MINUS) {
- 			next ();
- 			if (current () == SparqlTokenType.INTEGER ||
-@@ -994,7 +1001,7 @@ public class Tracker.Sparql.Query : Object {
- 			anon_blank_node_open = true;
- 			next ();
- 
--			result = generate_bnodeid (null);
-+			result = generate_bnodeid (null, builder);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-@@ -1061,7 +1068,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	private void parse_construct_object (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
- 		bool is_null = false;
--		string object = parse_construct_var_or_term (var_value_map, type, out is_null);
-+		string object = parse_construct_var_or_term (var_value_map, type, out is_null, null);
- 		var data = manager.get_data ();
- 		if (current_subject == null || current_predicate == null || object == null) {
- 			// the SPARQL specification says that triples containing unbound variables
--- 
-2.17.0
-

app-misc/tracker/files/2.1.7-upgrade-path-fix.patch

@@ -1,33 +0,0 @@
-From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 17 Dec 2018 13:34:23 +0100
-Subject: [PATCH] libtracker-data: Update FTS if base tables were altered
-
-That will issue an update of all tables, so the FTS view might be
-affected. This is not caught by ontology change tests, as this
-is a situation that can only happen when migrating from 1.x databases
-ATM.
-
-(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144)
----
- src/libtracker-data/tracker-data-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
-index f2addd0df..05a96b4dd 100644
---- a/src/libtracker-data/tracker-data-manager.c
-+++ b/src/libtracker-data/tracker-data-manager.c
-@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager  *manager,
- 	}
- 
- #if HAVE_TRACKER_FTS
--	if (in_update) {
--		update_fts = tracker_data_manager_fts_changed (manager);
-+	if (base_tables_altered || in_update) {
-+		update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager);
- 
- 		if (update_fts)
- 			tracker_db_interface_sqlite_fts_delete_table (iface);
--- 
-2.17.0
-

app-misc/tracker/tracker-2.1.8.ebuild

@@ -48,9 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
-	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
-	"${FILESDIR}"/${PV}-upgrade-path-fix.patch
 )
 
 function inotify_enabled() {

app-office/calcurse/Manifest

@@ -1 +1 @@
-DIST calcurse-4.3.0.tar.gz 597490 BLAKE2B 7fe31fc09cae12438173d4846a1e4b0a55f9e9416ab23ffc8b78e9d0f621072d8aca96b4161d5659db088e1007f685228e9669aae2d5606939c6564252826e1d SHA512 d948354b512d406f4915ce37107d3f529031e7698d7b38465913ff37120a93283e01f09f5267ebb19bf39ea133d6fac579b218d6dfd6056003b6222f9038f4b3
+DIST calcurse-4.4.0.tar.gz 620263 BLAKE2B 8fbe875f5e757ec3c11b9c23a994260403ee990bfcb3d4c41eefbf06a6db9e76cd5157e32b11c3fdc049896d5db3a9856862724902dab1cb48e0b00ef5df6f73 SHA512 43d30ad68bb39aaa9460644a691e66cbb15b9930737581583da65d00214c70fb1148a0edeca4430abb7a5cef2821b0f4c6fdbed8188d9ea5da5fedc4f95fa07c

app-office/calcurse/calcurse-4.3.0-r1.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="a text-based calendar and scheduling application"
-HOMEPAGE="https://calcurse.org/"
-SRC_URI="https://calcurse.org/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-
-RDEPEND="
-	dev-python/httplib2
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.1-tinfo.patch
-)
-
-# Most tests fail.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}

app-office/calcurse/calcurse-4.4.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ppc ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/httplib2

app-office/kmymoney/kmymoney-5.0.3.ebuild

@@ -20,7 +20,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"

app-office/libalkimia/libalkimia-7.0.2-r1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+KMNAME="alkimia"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/${KMNAME}-${PV}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+IUSE="doc gmp"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	$(add_qt_dep qtdbus)
+	!gmp? ( sci-libs/mpir:= )
+	gmp? ( dev-libs/gmp:0=[cxx] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package !gmp MPIR)
+	)
+	kde5_src_configure
+}

app-office/pybliographer/pybliographer-1.2.18.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="bluetooth debug java perl png python static-libs threads usb"
 
 COMMON_DEPEND="

app-portage/eix/Manifest

@@ -1,2 +1,3 @@
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
+DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077

app-portage/eix/eix-0.33.7.ebuild

@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++14
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
+
+}
+
+pkg_postinst() {
+		tmpfiles_process eix.conf
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}

app-portage/golop/golop-0.0.1-r1.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+EGO_PN=github.com/klausman/golop
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build prefix
+
+DESCRIPTION="A pure Go re-implementation of genlop"
+HOMEPAGE="https://github.com/klausman/golop"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i -e 's@/var/log/emerge.log@'"${EPREFIX}"'&@g' src/github.com/klausman/golop/main.go || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+
+	declare -a DOCS
+	DOCS+=( src/${EGO_PN}/README.md )
+	einstalldocs
+}

app-portage/golop/golop-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ else
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
-inherit golang-build
+inherit golang-build prefix
 
 DESCRIPTION="A pure Go re-implementation of genlop"
 HOMEPAGE="https://github.com/klausman/golop"
@@ -22,6 +22,11 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+src_prepare() {
+	sed -i -e 's@/var/log/emerge.log@'"${EPREFIX}"'&@g' src/github.com/klausman/golop/main.go || die
+	default
+}
+
 src_install() {
 	dobin ${PN}
 

app-text/cmark/cmark-0.28.3.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"

app-text/discount/discount-2.2.4.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
 
 src_prepare() {

app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild

@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-single
 
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+DOCBOOKDIR="${EPREFIX}/usr/share/sgml/${PN/-//}"
 MY_PN="${PN%-stylesheets}"
 MY_P="${MY_PN}-${PV}"
 
@@ -20,8 +19,10 @@ SLOT="0"
 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="ruby"
 
-RDEPEND=">=app-text/build-docbook-catalog-1.1
-	ruby? ( ${RUBY_DEPS} )"
+RDEPEND="
+	>=app-text/build-docbook-catalog-1.1
+	ruby? ( ${RUBY_DEPS} )
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,7 +43,7 @@ src_prepare() {
 		 -printf "removed %p\n" -delete || die
 
 	if ! use ruby; then
-	   rm -rv epub/ || die
+		rm -rv epub/ || die
 	fi
 }
 
@@ -83,12 +84,12 @@ src_install() {
 		# we can't use a symlink or it'll look for the library in the
 		# wrong path.
 		dodir /usr/bin
-		cat - > "${D}"/usr/bin/${cmd} <<EOF
+		cat - > "${D}"${EPREFIX}/usr/bin/${cmd} <<EOF
 #!/usr/bin/env ruby
 
 load "${DOCBOOKDIR}/epub/bin/dbtoepub"
 EOF
-		fperms 0755 /usr/bin/${cmd}
+		fperms 0755 ${EPREFIX}/usr/bin/${cmd}
 	fi
 }
 

app-text/poppler/poppler-0.74.0.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 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"
+	KEYWORDS="~alpha amd64 ~arm arm64 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"
 	SLOT="0/85"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 

app-text/qpdf/qpdf-8.2.1.ebuild

@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/21"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="

app-text/referencer/referencer-1.2.2.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit xdg-utils eutils python-single-r1 flag-o-matic
+inherit xdg python-single-r1 flag-o-matic
 
 DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
 HOMEPAGE="https://launchpad.net/referencer"
@@ -13,15 +13,16 @@ SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	>=app-text/poppler-0.12.3-r3[cairo]
-	>=dev-cpp/gtkmm-2.8:*
+	>=dev-cpp/gtkmm-2.8:2.4
 	>=dev-cpp/libglademm-2.6.0
 	>=dev-cpp/gconfmm-2.14.0
-	>=dev-libs/boost-1.52.0-r4"
+	>=dev-libs/boost-1.52.0-r4:="
 
 DEPEND="
 	${RDEPEND}
@@ -30,7 +31,10 @@ DEPEND="
 	>=dev-lang/perl-5.8.1
 	dev-perl/libxml-perl
 	dev-util/intltool
-	app-text/rarian"
+	app-text/rarian
+	test? ( app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/scrollkeeper-dtd:1.0 )"
 
 PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
 
@@ -45,13 +49,3 @@ src_configure() {
 		--disable-update-mime-database \
 		--enable-python
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

dev-cpp/eigen/Manifest

@@ -1,3 +1 @@
-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

dev-cpp/eigen/eigen-3.2.8-r2.ebuild

@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils 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="LGPL-2 GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="altivec debug doc openmp test"
-IUSE+=" cpu_flags_x86_sse2"
-IUSE+=" cpu_flags_x86_sse3"
-IUSE+=" cpu_flags_x86_sse4_1"
-IUSE+=" cpu_flags_x86_sse4_2"
-IUSE+=" cpu_flags_x86_ssse3"
-#IUSE+=" cpu_flags_x86_x87"
-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
-		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
-	)
-	"
-# Missing:
-# METIS-5
-# GOOGLEHASH
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.7-pastix-5.2-backport.patch
-	"${FILESDIR}"/${PN}-3.2.7-adaolc-backport.patch
-)
-
-src_unpack() {
-	default
-	mv ${PN}* ${P} || die
-}
-
-src_prepare() {
-	sed \
-		-e 's:-g2::g' \
-		-i cmake/EigenConfigureTesting.cmake || die
-
-	sed -i CMakeLists.txt \
-		-e "/add_subdirectory(demos/d" \
-		|| die "sed disable unused bundles failed"
-
-	if ! use test; then
-		sed -i CMakeLists.txt \
-			-e "/add_subdirectory(blas/d" \
-			-e "/add_subdirectory(lapack/d" \
-			|| die "sed disable unused bundles failed"
-	fi
-
-	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DEIGEN_BUILD_TESTS=ON
-		-DEIGEN_TEST_NOQT=ON
-		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
-		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
-		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
-		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
-		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
-		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
-#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile blas
-	cmake-utils_src_compile buildtests
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-
-	# Debian installs it and some projects started using it.
-	insinto /usr/share/cmake/Modules/
-	doins "${S}/cmake/FindEigen3.cmake"
-}

dev-cpp/eigen/eigen-3.3.5-r1.ebuild

@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-PATCHES=( "${FILESDIR}/${P}-fix-prototype.patch" )
-
-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"
-}

dev-cpp/eigen/files/eigen-3.2.7-adaolc-backport.patch

@@ -1,40 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1448895622 -3600
-# Node ID e515e2706d00294a5749db7832d10ea366b9389f
-# Parent  eb4bf011a2ea5fc4ddb0aa5332d6e616198ed886
-Update ADOL-C support.
-
-diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward
---- a/unsupported/Eigen/AdolcForward
-+++ b/unsupported/Eigen/AdolcForward
-@@ -25,7 +25,7 @@
- #ifndef NUMBER_DIRECTIONS
- # define NUMBER_DIRECTIONS 2
- #endif
--#include <adolc/adouble.h>
-+#include <adolc/adtl.h>
- 
- // adolc defines some very stupid macros:
- #if defined(malloc)
-diff --git a/unsupported/test/forward_adolc.cpp b/unsupported/test/forward_adolc.cpp
---- a/unsupported/test/forward_adolc.cpp
-+++ b/unsupported/test/forward_adolc.cpp
-@@ -13,8 +13,6 @@
- #define NUMBER_DIRECTIONS 16
- #include <unsupported/Eigen/AdolcForward>
- 
--int adtl::ADOLC_numDir;
--
- template<typename Vector>
- EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p)
- {
-@@ -123,7 +121,7 @@
- 
- void test_forward_adolc()
- {
--  adtl::ADOLC_numDir = NUMBER_DIRECTIONS;
-+  adtl::setNumDir(NUMBER_DIRECTIONS);
- 
-   for(int i = 0; i < g_repeat; i++) {
-     CALL_SUBTEST(( adolc_forward_jacobian(TestFunc1<double,2,2>()) ));

dev-cpp/eigen/files/eigen-3.2.7-pastix-5.2-backport.patch

@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1393589499 -3600
-# Node ID b88efb384b160880131ad17e39bb690719112bfa
-# Parent  576120ad694efe29b70999576964d3816288fb4e
-Fix PaStiX support for Pastix 5.2
-
-diff --git a/Eigen/src/PaStiXSupport/PaStiXSupport.h b/Eigen/src/PaStiXSupport/PaStiXSupport.h
---- a/Eigen/src/PaStiXSupport/PaStiXSupport.h
-+++ b/Eigen/src/PaStiXSupport/PaStiXSupport.h
-@@ -12,6 +12,14 @@
- 
- namespace Eigen { 
- 
-+#if defined(DCOMPLEX)
-+  #define PASTIX_COMPLEX  COMPLEX
-+  #define PASTIX_DCOMPLEX DCOMPLEX
-+#else
-+  #define PASTIX_COMPLEX  std::complex<float>
-+  #define PASTIX_DCOMPLEX std::complex<double>
-+#endif
-+
- /** \ingroup PaStiXSupport_Module
-   * \brief Interface to the PaStix solver
-   * 
-@@ -74,14 +82,14 @@
-   {
-     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
-     if (nbrhs == 0) {x = NULL; nbrhs=1;}
--    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<COMPLEX*>(vals), perm, invp, reinterpret_cast<COMPLEX*>(x), nbrhs, iparm, dparm); 
-+    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_COMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_COMPLEX*>(x), nbrhs, iparm, dparm); 
-   }
-   
-   void eigen_pastix(pastix_data_t **pastix_data, int pastix_comm, int n, int *ptr, int *idx, std::complex<double> *vals, int *perm, int * invp, std::complex<double> *x, int nbrhs, int *iparm, double *dparm)
-   {
-     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
-     if (nbrhs == 0) {x = NULL; nbrhs=1;}
--    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<DCOMPLEX*>(vals), perm, invp, reinterpret_cast<DCOMPLEX*>(x), nbrhs, iparm, dparm); 
-+    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_DCOMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_DCOMPLEX*>(x), nbrhs, iparm, dparm); 
-   }
- 
-   // Convert the matrix  to Fortran-style Numbering

dev-cpp/eigen/files/eigen-3.3.5-fix-prototype.patch

@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael@free.fr>
-# Date 1528444561 -7200
-# Node ID 27cac8430247a65739fcd0b83ef984d0a9c010c7
-# Parent  d4cbff8d06baf95045869ed7d0c012d641c88fcf
-fix prototype
-
-diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
---- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
-+++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h
-@@ -173,7 +173,7 @@
-   /** 
-    * Set the restart value (default is 30)  
-    */
--  Index set_restart(const Index restart) { m_restart=restart; }
-+  void set_restart(const Index restart) { m_restart=restart; }
-   
-   /** 
-    * Set the number of eigenvalues to deflate at each restart 

dev-cpp/waylandpp/Manifest

@@ -1,8 +1,3 @@
-DIST waylandpp-0.1.0.tar.gz 166427 BLAKE2B eef7f14df491e053f2c8cb63aaafc9e9251af6a5f769208240484974767ab971ec1ed03bfdc58275d756d42e4605e19af84ed8aa311ddfeaa92c8b3c25a4595f SHA512 e0521ea99eeb7ae196ed9c8759e10d28406c5b99534b52ac51845cdd9c384ff820e4cc1fec65c537a0d071046746884793da122c72f6e75e7df4bca089d19eca
-DIST waylandpp-0.1.2.tar.gz 166624 BLAKE2B 8136fb8c7ece2a2ce9d93bd833dbc9c604c47dfd27b17cda60b0c5894d4aada7761e220d9cabf8e5107115e00d2d16fd99a098dac9be6614926b428ea234d788 SHA512 2304390be26134561fb69e208a6bafd0e9789e6b212ff2f46384c6ed50ae1c9eca3f06a3b4958c8e710cc1a0be61ed84c7ff292ec7011dbb0396cd2d83363f7f
-DIST waylandpp-0.1.4.tar.gz 168409 BLAKE2B 43811051f1c4cf8795c63d24c54f6f3fac59bf4a482b9dd0f3e2645272475abc732a44330e08449e34f67aa90224382d18ffb0e6f52d9f250685813186ad6e97 SHA512 3f2e9bca0776c02ec3b7a4f76a34214333e0663e2ab81d81cfbc37e1f14bda47e16b3840386b961d47ca993207b0b9f4d4859b621f22fe4e3653c4b14842e001
-DIST waylandpp-0.1.5.tar.gz 168432 BLAKE2B 0d3efcb489a713be1ae9db0366b47436b0789468b956ac781f981b3bf1feaebdf2be083f6d1263190e202a45e4416d2d972ffc67d8b87115146f14a5c4af41a5 SHA512 bce1f29607fe61f4b8464abc6111121e3c18777d2e982f143b33087d53af58e9d3a61e412c46dbe73d8cbbaa889da806978e9b3854ce01db8feb53d777625a6f
-DIST waylandpp-0.1.6.tar.gz 180123 BLAKE2B 552dbea6b6d9c3f937aa56a69c90485f6946366589793e53817bada7b2dc1eca0c58a741b22f5f0f7fac04bb14d668f01a1c2418343ebf32845dc1bf02656957 SHA512 93ed7157017394f7df0d7cdf2f56e1d8621893cc8cb77b01206534b8ca40528aba6bd2b922b359809bdca7831fa45668f85903e9e3dd6f0759839c7318349c94
-DIST waylandpp-0.2.2.tar.gz 180313 BLAKE2B 558f26e9ce2edcafacfbd874bcf99176a3bc10b2991eaba0dee64c06f0e7a25f3800b2facdd7e86c775003bd2f06ddb6911a3f956f9d8089512e95fd5d03c120 SHA512 e9288482e1b59eacf71a4164dfec3236f2d6d63aee6d530d1f71bbdb20db6986137a50ac34438219463a4208897424d28d2346d2c51dccaf3e77953e4db085f2
 DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
 DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
+DIST waylandpp-0.2.5.tar.gz 177735 BLAKE2B 9add6147b7694d275f2f15f03476aef5bddebdca029f012743a0c0c388c7ef7394536b4401c78830487bb1c36a0b29ea348bc2acf60617af7bcbf917a5b691dd SHA512 a8c80282022b2ede3c3d0f5516e236aedaf3ef685565da8c61214fe37eda139bf152093eb29960be1889798eef5631b9d68a5e832c10cf1160c4a90f45eccb6e

dev-cpp/waylandpp/waylandpp-0.1.0.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_prepare() {
-	default
-	sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die
-}
-
-src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons
-	if use doc; then
-		doxygen || die "error making docs"
-	fi
-}
-
-src_install() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install
-	# fix multilib-strict QA failures
-	if use doc; then
-		doman doc/man/man3/*.3
-		local HTML_DOCS=( doc/html )
-		einstalldocs
-	fi
-}

dev-cpp/waylandpp/waylandpp-0.1.2.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_prepare() {
-	default
-	sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, \"$(get_libdir)\":g" SConstruct || die
-}
-
-src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons
-	if use doc; then
-		doxygen || die "error making docs"
-	fi
-}
-
-src_install() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons install
-	# fix multilib-strict QA failures
-	if use doc; then
-		doman doc/man/man3/*.3
-		local HTML_DOCS=( doc/html )
-		einstalldocs
-	fi
-}

dev-cpp/waylandpp/waylandpp-0.1.4.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}

dev-cpp/waylandpp/waylandpp-0.1.5.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}

dev-cpp/waylandpp/waylandpp-0.2.2.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Wayland C++ bindings"
-HOMEPAGE="https://github.com/NilsBrause/waylandpp"
-
-LICENSE="MIT"
-IUSE="doc"
-SLOT="0/$(get_version_component_range 1-2)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/wayland-1.11.0
-	media-libs/mesa[wayland]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}

dev-cpp/waylandpp/waylandpp-0.2.5.ebuild

@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake-utils
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
 
 LICENSE="MIT"
 IUSE="doc"
-SLOT="0/$(get_major_version)"
+SLOT="0/$(ver_cut 1-2)"
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
@@ -23,6 +23,7 @@ fi
 RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.9-r1
 "
 DEPEND="${RDEPEND}
 	doc? (

dev-cpp/waylandpp/waylandpp-9999.ebuild

@@ -23,7 +23,7 @@ fi
 RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
-	>=dev-libs/pugixml-1.4
+	>=dev-libs/pugixml-1.9-r1
 "
 DEPEND="${RDEPEND}
 	doc? (

dev-db/pgtap/pgtap-0.99.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}

dev-db/sqlite/Manifest

@@ -3,13 +3,16 @@ DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cb
 DIST sqlite-autoconf-3250200.tar.gz 2763876 BLAKE2B 3d97cc60edf8f91855215bd59260362665c8ec7699510f2e07c7ba57e10c400dcc99bb392e216f798bef1ffa7120b48ee62ce144a871741ef57b3aefeab875d6 SHA512 5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9
 DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c6563e937a45d6ef4aae1b941d42c06cb8630210c33583f25e41f3f90b181ce47da650f81845ad88cafbf9c764164cf8b5d92e81 SHA512 5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5e0ba031a6744af89f7659206e28e7de2f0367bdb190b8412e453b43de4ba
 DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8
+DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4
 DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
 DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6
 DIST sqlite-doc-3250200.zip 9229732 BLAKE2B 9bc4499c2934d15428dd30e0522362a2c2e703061c293f1b657f01d3945612760be3b4f145ddf76d9cf87953fae26884646887e53c0c55683ce42bc239dcf952 SHA512 a0b764ca0eea0e9719d46b6e1f92db78578457c8331976d4712c56cd10fc062fd73629686a0e45dfdeb505fbfbe0c53652a5e64507702ff4e12b62a2fc8d8211
 DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac
 DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade
+DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f
 DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
 DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e
 DIST sqlite-src-3250200.zip 11381811 BLAKE2B 6183436f66c862c32d1dfd59ea4ccb5eaf3dd516ffcf9d7edf786e8fbf56eff3cb84d08e291b2e86fae25e537bed452aed693bdb0f0d6bb6581da86641013557 SHA512 7354af2d45c574ba867fab8aabc6ff903279f028aebed50c71019066df78f61a0b941564c572c87b0f3ed3e5783bf325a690a9957d775228fbbb293dd9a5ad37
 DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65
 DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3
+DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945

dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch

@@ -0,0 +1,461 @@
+Move some code to libsqlite3.so to avoid duplication.
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- /Makefile.in
++++ /Makefile.in
+@@ -311,6 +311,9 @@
+ # Source code for extensions
+ #
+ SRC += \
++  $(TOP)/ext/expert/sqlite3expert.c \
++  $(TOP)/ext/expert/sqlite3expert.h
++SRC += \
+   $(TOP)/ext/fts1/fts1.c \
+   $(TOP)/ext/fts1/fts1.h \
+   $(TOP)/ext/fts1/fts1_hash.c \
+@@ -363,8 +366,11 @@
+   $(TOP)/ext/rbu/sqlite3rbu.h \
+   $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
++  $(TOP)/ext/misc/appendvfs.c \
+   $(TOP)/ext/misc/json1.c \
+-  $(TOP)/ext/misc/stmt.c
++  $(TOP)/ext/misc/sqlar.c \
++  $(TOP)/ext/misc/stmt.c \
++  $(TOP)/ext/misc/zipfile.c
+ 
+ # Generated source code files
+ #
+@@ -434,7 +440,6 @@
+ # Statically linked extensions
+ #
+ TESTSRC += \
+-  $(TOP)/ext/expert/sqlite3expert.c \
+   $(TOP)/ext/expert/test_expert.c \
+   $(TOP)/ext/misc/amatch.c \
+   $(TOP)/ext/misc/carray.c \
+@@ -460,7 +465,6 @@
+   $(TOP)/ext/misc/totype.c \
+   $(TOP)/ext/misc/unionvtab.c \
+   $(TOP)/ext/misc/wholenumber.c \
+-  $(TOP)/ext/misc/zipfile.c \
+   $(TOP)/ext/userauth/userauth.c
+ 
+ # Source code to the library files needed by the test fixture
+@@ -639,25 +643,25 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
++sqlite3$(TEXE):	shell.c libsqlite3.la
++	$(LTLINK) $(READLINE_FLAGS) -o $@ \
++		shell.c libsqlite3.la \
++		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
++sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+-dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
++dbhash$(TEXE):	$(TOP)/tool/dbhash.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
+ 
+-scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
++scrub$(TEXE):	$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
+-		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
++		$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -767,7 +771,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
++	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1067,14 +1071,9 @@
+ # Source files that go into making shell.c
+ SHELL_SRC = \
+ 	$(TOP)/src/shell.c.in \
+-        $(TOP)/ext/misc/appendvfs.c \
+ 	$(TOP)/ext/misc/shathree.c \
+ 	$(TOP)/ext/misc/fileio.c \
+ 	$(TOP)/ext/misc/completion.c \
+-	$(TOP)/ext/misc/sqlar.c \
+-	$(TOP)/ext/expert/sqlite3expert.c \
+-	$(TOP)/ext/expert/sqlite3expert.h \
+-	$(TOP)/ext/misc/zipfile.c \
+ 	$(TOP)/ext/misc/memtrace.c \
+         $(TOP)/src/test_windirent.c
+ 
+@@ -1242,15 +1241,15 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
++	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
++	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
++	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+ 
+ # The veryquick.test TCL tests.
+@@ -1281,24 +1280,23 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
++sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
++	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
++sqltclsh.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
+ 
+-sqltclsh$(TEXE): sqltclsh.c
+-	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
++sqltclsh$(TEXE):	sqltclsh.c libsqlite3.la
++	$(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+-	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
++sqlite3_expert$(TEXE):	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
++	$(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
+ 
+ CHECKER_DEPS =\
+   $(TOP)/tool/mkccode.tcl \
+-  sqlite3.c \
+   $(TOP)/src/tclsqlite.c \
+   $(TOP)/ext/repair/sqlite3_checker.tcl \
+   $(TOP)/ext/repair/checkindex.c \
+@@ -1309,36 +1307,36 @@
+ sqlite3_checker.c:	$(CHECKER_DEPS)
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
+ 
+-sqlite3_checker$(TEXE):	sqlite3_checker.c
+-	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_checker$(TEXE):	sqlite3_checker.c libsqlite3.la
++	$(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
++dbdump$(TEXE):	$(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 	$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
+-           $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
++           $(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 
+-dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
+-	$(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
++dbtotxt$(TEXE):	$(TOP)/tool/dbtotxt.c
++	$(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
++showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
++showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
++showjournal$(TEXE):	$(TOP)/tool/showjournal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
++showwal$(TEXE):	$(TOP)/tool/showwal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+ showshm$(TEXE):	$(TOP)/tool/showshm.c
+ 	$(LTLINK) -o $@ $(TOP)/tool/showshm.c
+ 
+-index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
+-	$(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
++index_usage$(TEXE):	$(TOP)/tool/index_usage.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la
+ 
+-changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
++changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+ 
+ changesetfuzz$(TEXE):	$(TOP)/ext/session/changesetfuzz.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
+@@ -1363,11 +1361,11 @@
+ kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
+ 	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
++rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
++	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+-	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
++loadfts$(EXE):	$(TOP)/tool/loadfts.c libsqlite3.la
++	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
+ 
+ # This target will fail if the SQLite amalgamation contains any exported
+ # symbols that do not begin with "sqlite3_". It is run as part of the
+--- /configure.ac
++++ /configure.ac
+@@ -587,6 +587,9 @@
+ if test "${enable_load_extension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
++  if test "${ac_cv_search_dlopen}" = "no" ; then
++    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
++  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
+--- /ext/misc/sqlar.c
++++ /ext/misc/sqlar.c
+@@ -14,6 +14,8 @@
+ ** for working with sqlar archives and used by the shell tool's built-in
+ ** sqlar support.
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <zlib.h>
+@@ -119,3 +121,5 @@
+   }
+   return rc;
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/misc/zipfile.c
++++ /ext/misc/zipfile.c
+@@ -24,6 +24,8 @@
+ **    *  No support for zip64 extensions
+ **    *  Only the "inflate/deflate" (zlib) compression method is supported
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <stdio.h>
+@@ -2176,3 +2178,5 @@
+   (void)pzErrMsg;  /* Unused parameter */
+   return zipfileRegister(db);
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/repair/sqlite3_checker.c.in
++++ /ext/repair/sqlite3_checker.c.in
+@@ -2,6 +2,7 @@
+ ** Read an SQLite database file and analyze its space utilization.  Generate
+ ** text on standard output.
+ */
++#define SQLITE_CORE 1
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1
+ #define SQLITE_ENABLE_JSON1 1
+@@ -14,7 +15,7 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ INCLUDE $ROOT/ext/misc/btreeinfo.c
+ INCLUDE $ROOT/ext/repair/checkindex.c
+--- /src/shell.c.in
++++ /src/shell.c.in
+@@ -61,6 +61,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include "sqlite3.h"
++#include "ext/expert/sqlite3expert.h"
+ typedef sqlite3_int64 i64;
+ typedef sqlite3_uint64 u64;
+ typedef unsigned char u8;
+@@ -127,6 +128,10 @@
+ # define SHELL_USE_LOCAL_GETLINE 1
+ #endif
+ 
++#ifdef SQLITE_HAVE_ZLIB
++#include <zlib.h>
++#endif
++
+ 
+ #if defined(_WIN32) || defined(WIN32)
+ # include <io.h>
+@@ -939,14 +944,7 @@
+ INCLUDE ../ext/misc/shathree.c
+ INCLUDE ../ext/misc/fileio.c
+ INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.c
+ INCLUDE ../ext/misc/memtrace.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE ../ext/misc/zipfile.c
+-INCLUDE ../ext/misc/sqlar.c
+-#endif
+-INCLUDE ../ext/expert/sqlite3expert.h
+-INCLUDE ../ext/expert/sqlite3expert.c
+ 
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+@@ -3934,7 +3932,9 @@
+     sqlite3_shathree_init(p->db, 0, 0);
+     sqlite3_completion_init(p->db, 0, 0);
+ #ifdef SQLITE_HAVE_ZLIB
++    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_zipfile_init(p->db, 0, 0);
++    extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_sqlar_init(p->db, 0, 0);
+ #endif
+     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
+@@ -5868,6 +5868,7 @@
+         goto end_ar_command;
+       }
+       sqlite3_fileio_init(cmd.db, 0, 0);
++      extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+       sqlite3_sqlar_init(cmd.db, 0, 0);
+       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
+                               shellPutsFunc, 0, 0);
+@@ -9045,6 +9046,7 @@
+ #endif
+   }
+   data.out = stdout;
++  extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ 
+   /* Go ahead and open the database file if it already exists.  If the
+--- /test/sessionfuzz.c
++++ /test/sessionfuzz.c
+@@ -700,42 +700,6 @@
+ #include <assert.h>
+ #include "zlib.h"
+ 
+-/*
+-** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
+-**
+-** Parameter SZ is interpreted as an integer. If it is less than or
+-** equal to zero, then this function returns a copy of X. Or, if
+-** SZ is equal to the size of X when interpreted as a blob, also
+-** return a copy of X. Otherwise, decompress blob X using zlib
+-** utility function uncompress() and return the results (another
+-** blob).
+-*/
+-static void sqlarUncompressFunc(
+-  sqlite3_context *context,
+-  int argc,
+-  sqlite3_value **argv
+-){
+-  uLong nData;
+-  uLongf sz;
+-
+-  assert( argc==2 );
+-  sz = sqlite3_value_int(argv[1]);
+-
+-  if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){
+-    sqlite3_result_value(context, argv[0]);
+-  }else{
+-    const Bytef *pData= sqlite3_value_blob(argv[0]);
+-    Bytef *pOut = sqlite3_malloc(sz);
+-    if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){
+-      sqlite3_result_error(context, "error in uncompress()", -1);
+-    }else{
+-      sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT);
+-    }
+-    sqlite3_free(pOut);
+-  }
+-}
+-
+-
+ /* Run a chunk of SQL.  If any errors happen, print an error message
+ ** and exit.
+ */
+--- /tool/mksqlite3c.tcl
++++ /tool/mksqlite3c.tcl
+@@ -117,6 +117,7 @@
+    rtree.h
+    sqlite3session.h
+    sqlite3.h
++   sqlite3expert.h
+    sqlite3ext.h
+    sqlite3rbu.h
+    sqliteicu.h
+@@ -403,6 +404,10 @@
+    sqlite3session.c
+    fts5.c
+    stmt.c
++   appendvfs.c
++   sqlar.c
++   sqlite3expert.c
++   zipfile.c
+ } {
+   copy_file tsrc/$file
+ }
+--- /tool/sqlite3_analyzer.c.in
++++ /tool/sqlite3_analyzer.c.in
+@@ -14,9 +14,6 @@
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_LOAD_EXTENSION 1
+-#ifndef USE_EXTERNAL_SQLITE
+-INCLUDE sqlite3.c
+-#endif
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
+--- /tool/sqltclsh.c.in
++++ /tool/sqltclsh.c.in
+@@ -27,19 +27,17 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
+-INCLUDE $ROOT/ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE $ROOT/ext/misc/zipfile.c
+-INCLUDE $ROOT/ext/misc/sqlar.c
+-#endif
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
+   (void)interp;
++  extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ #ifdef SQLITE_HAVE_ZLIB
++  extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
++  extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
+ #endif
+ 

dev-db/sqlite/sqlite-3.27.1.ebuild

@@ -0,0 +1,327 @@
+# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+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"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-arch/unzip )
+	tcl? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)
+	test? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)
+	tools? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0
+	)"
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+full_archive() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_archive; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_archive; then
+		eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+	else
+		eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac || die "sed failed"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_archive; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
+	# https://sqlite.org/pragma.html#pragma_function_list
+	# https://sqlite.org/pragma.html#pragma_module_list
+	# https://sqlite.org/pragma.html#pragma_pragma_list
+	append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	# debug USE flag.
+	if full_archive; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_archive; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_archive && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_archive; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+		(
+			docinto html
+			dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+		)
+	fi
+}

dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}

dev-java/sbt-bin/Manifest

@@ -1,2 +1,3 @@
 DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a6592ca66bc3b02df3b27676b49364db8c6d2ec259b22b09a7e7a2d364e940890be38a96ba079066c4fa2 SHA512 7b278ecd22d4778482c61ec2e9650c8dd199c341aaaa624fee6b7f8989203de3d4dac24c4181ee08f0da50c69901321a1e11a535f0911241c9f6bfdfab5e94b8
 DIST sbt-1.1.5.tgz 49603901 BLAKE2B b458600bec2610fd76e5ca21633738b6815bf6c3e2918814147c904b97ab80b972a15b31f555777d0aa7f2e4613eef9b109745476d0cd7166506573aa2a72873 SHA512 bb538d88ec5ee7bb08b5eed6e7e250c45ee25419952473e4f093391316f936b26cc181f21c7b3501b9126a5c1f21b10514adffea4f9a09f7920203ba6330c2d4
+DIST sbt-1.2.8.tgz 47179935 BLAKE2B f31dcf25168471cb7315d8dc8f168321098fbfbf985bcc5aa294ea95c6b65d299ee0f9b457d6dc3569eff6117f0fbf5fd51b37ca9294f7bcca2256f52e07b73f SHA512 e12d50de4481dc599b8e129b5caf86b4a6a42426612308f9c8dd791525b5ae325e65f1c1db479bdc00fed2421c108a0dcdd00585f90334446e2cef914484719a

dev-java/sbt-bin/sbt-bin-1.2.8.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://scala-sbt.org"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	!dev-java/sbt"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sbt" "${S}" || die
+}
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt-launch-lib.bash || die
+
+	insinto "${dest}/lib"
+	doins bin/* || die
+
+	insinto "${dest}"
+	doins -r conf || die
+
+	fperms 0755 "${dest}/lib/sbt" || die
+	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+}

dev-lang/rust/rust-1.30.1-r1.ebuild

@@ -137,7 +137,7 @@ src_configure() {
 		release-debuginfo = $(toml_usex debug)
 		assertions = $(toml_usex debug)
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "$(usex wasm WebAssembly '')"
 		link-shared = $(toml_usex system-llvm)
 		[build]
 		build = "${rust_target}"

dev-lang/rust/rust-1.31.1.ebuild

@@ -137,7 +137,7 @@ src_configure() {
 		release-debuginfo = $(toml_usex debug)
 		assertions = $(toml_usex debug)
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "$(usex wasm WebAssembly '')"
 		link-shared = $(toml_usex system-llvm)
 		[build]
 		build = "${rust_target}"

dev-lang/rust/rust-1.32.0.ebuild

@@ -143,7 +143,7 @@ src_configure() {
 		release-debuginfo = $(toml_usex debug)
 		assertions = $(toml_usex debug)
 		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
+		experimental-targets = "$(usex wasm WebAssembly '')"
 		link-shared = $(toml_usex system-llvm)
 		[build]
 		build = "${rust_target}"

dev-libs/chmlib/chmlib-0.40-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
 PATCHES=(