Sync with portage [Wed Jun 13 20:26:59 MSK 2018].

2018-06-13 20:26:59 +03:00 · 2018-06-13 20:26:59 +03:00 · 77864ed81e
commit 77864ed81e
parent f673badd85
25936 changed files with 32137 additions and 31151 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/cdist/cdist-4.6.1.ebuild
+++ b/app-admin/cdist/cdist-4.6.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1

 DESCRIPTION="A usable configuration management system"
-HOMEPAGE="http://www.nico.schottelius.org/software/cdist/"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
--- a/app-admin/cdist/cdist-4.7.3.ebuild
+++ b/app-admin/cdist/cdist-4.7.3.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1

 DESCRIPTION="A usable configuration management system"
-HOMEPAGE="http://www.nico.schottelius.org/software/cdist/"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@ -1,3 +1,4 @@
 DIST innoextract-1.4.tar.gz 151230 BLAKE2B 94c229bf4e28ca6433f9bd8cdfe23132ad84c67812540eeb950921de7389f7b565b4bea1853feb7732a9704f412b93886098b7a1b023021f06f5b22a220fb81a SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea
 DIST innoextract-1.5.tar.gz 179582 BLAKE2B 41774ab38d9d774533ccb7d8a62757e91ff803e5f5e1ac115ba72081ebc31e6e8bf2e2dbf1b82ae20dd6adcca31f9d58d9ab1138fa7761a9cb877ae2c84249e0 SHA512 759c319c1f0737b9120ed4613bcab4bebcbb28749d9bbfa46ccb7b4f7640352b4ef01a03ed142c61f67188a83635d4e03e7b0708b913e1f47c09e5189bb56dd6
 DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62d9174c1902645a961f06877c3e702ce0386aa611fe954c412997a1a69355e441cc33e243abd1828ff5e9d2ff8a2 SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62
+DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
--- a/app-arch/innoextract/innoextract-1.7.ebuild
+++ b/app-arch/innoextract/innoextract-1.7.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="http://constexpr.org/innoextract/"
+SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +iconv +lzma"
+
+RDEPEND="
+	dev-libs/boost:=
+	iconv? ( virtual/libiconv )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md CHANGELOG )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DSET_OPTIMIZATION_FLAGS=OFF
+		-DSTRICT_USE=ON
+		-DUSE_LZMA=$(usex lzma)
+		-DWITH_CONV=$(usex iconv iconv builtin)
+	)
+
+	cmake-utils_src_configure
+}
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@ -1,2 +1 @@
-DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
--- a/app-arch/snappy/snappy-1.1.3-r1.ebuild
+++ b/app-arch/snappy/snappy-1.1.3-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	# Avoid automagic lzo and gzip by not checking for it
-	sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
-
-	# don't install unwanted files
-	sed -i 's/COPYING INSTALL//' Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-gflags
-		--disable-gtest
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
-}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@ -1,3 +1,3 @@
-DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
 DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
 DIST restic-0.9.0.tar.gz 51049118 BLAKE2B 4089a0eafe0f3778d540ffb87d5d773f1bb4296c3cb7a085a38cc1ac54742392790ccf61145ed3ff19a7e35b358e0b40c7f3edf6ee661e22ffd00efafa2bdee1 SHA512 c01e8450c7afbea59d86a53a5491e562ba5d1ab7fe3e96e0e5b53d96f4df2cf051d7abaef742ff2ecce759e2cd97386566e1c19260f0d74ae678edbe200aa885
+DIST restic-0.9.1.tar.gz 51056544 BLAKE2B eb66381e284c94b17b0fa31f824f41b24a52d04555af6798fa9ac2f1dd0ca168d5e8a9fde922b205c420288002743b86a49a16a939c07a0f3fd942348f0348b6 SHA512 9d365bdcb561255e2103d7170d02e850e5cf767bc2e02e099d57ec9aad719ebd4319446f5162e64437ca9a8e1fdca273fd1c6cc4314013ca07b5ebdbeef93c2a
--- a/app-backup/restic/restic-0.9.1.ebuild
+++ b/app-backup/restic/restic-0.9.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit golang-vcs-snapshot bash-completion-r1
+inherit bash-completion-r1 golang-vcs-snapshot

 DESCRIPTION="A backup program that is fast, efficient and secure"
 HOMEPAGE="https://restic.github.io/"
@ -15,19 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"

-DOCS=(
-	README.rst CONTRIBUTING.md doc/010_introduction.rst doc/020_installation.rst
-	doc/030_preparing_a_new_repo.rst doc/040_backup.rst doc/045_working_with_repos.rst
-	doc/050_restore.rst doc/060_forget.rst doc/070_encryption.rst doc/080_examples.rst
-	doc/090_participating.rst doc/100_references.rst doc/cache.rst doc/faq.rst
-	doc/index.rst doc/manual_rest.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
 RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"

 S="${WORKDIR}/${P}/src/${EGO_PN}"

@ -37,7 +26,7 @@ src_compile() {
 		-work
 		-x
 		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
+		-ldflags "-X main.version=${PV}"
 		-asmflags "-trimpath=${S}"
 		-gcflags "-trimpath=${S}"
 		-o restic ${EGO_PN}/cmd/restic
@ -54,15 +43,12 @@ src_test() {

 src_install() {
 	dobin restic
-	einstalldocs

 	newbashcomp doc/bash-completion.sh "${PN}"

 	insinto /usr/share/zsh/site-functions
 	newins doc/zsh-completion.zsh _restic

-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
+	doman doc/man/*
+	dodoc doc/*.rst
 }
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
+++ b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@ -1 +1 @@
-DIST moolticute-0.12.9.tar.gz 5364306 BLAKE2B adf101a779d4a7dc801f9d7705e6d6b624fb380a502a0fadf38463045af38d7d3a0a2005d1617f9d5874349b347b39632ccbb89f9edb97f7f74f62a7fd129220 SHA512 c02542f3bc3db4740e981cdec8ffb753189b15a341e55812de0f0592e23a678a1be73167d6fa5ca32e943d9cdf5f4937abe8132332b490104beed82d5b8d24a7
+DIST moolticute-0.18.1.tar.gz 5549370 BLAKE2B 11a1a40e799e54f18e44eacb6ded1892681932676328bfcf0dfc23d197fc418bbe5b726adee280125e974bdf0497e9148f60735e0f80785380ae1b2894d1b187 SHA512 166c2091e84bbe19fced593c97f195d958feb37556670a1e457a0532bf4df399dce214e89782cb8006db5eedad5b9d2c21e5dc9902137f5b2b17b96aa6780366
--- a/app-crypt/moolticute/moolticute-0.18.1.ebuild
+++ b/app-crypt/moolticute/moolticute-0.18.1.ebuild
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@ -1,5 +1,3 @@
-DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
-DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
--- a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
@ -1,11 +0,0 @@
--- /src/prediction/user_history_predictor.cc
-+++ /src/prediction/user_history_predictor.cc
-@@ -841,7 +841,7 @@
-       // swap.
-       if (i + 1 < prefix.size()) {
-         string swapped_prefix = prefix;
-        swap(swapped_prefix[i], swapped_prefix[i + 1]);
-+        std::swap(swapped_prefix[i], swapped_prefix[i + 1]);
-         if (Util::StartsWith(str, swapped_prefix)) {
-           return true;
-         }
--- a/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch
@ -1,291 +0,0 @@
--- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
-@@ -71,6 +71,12 @@
-     # use_libibus represents if ibus library is used or not.
-     # This option is only for Linux.
-     'use_libibus%': '0',
-+
-+    # use_libgtest represents if gtest library is used or not.
-+    'use_libgtest%': '0',
-+
-+    # use_libjsoncpp represents if jsoncpp library is used or not.
-+    'use_libjsoncpp%': '0',
-   },
-   'target_defaults': {
-     'defines': [
--- /src/net/jsoncpp.gyp
-+++ /src/net/jsoncpp.gyp
-@@ -31,32 +31,57 @@
-   'targets': [
-     {
-       'target_name': 'jsoncpp',
-      'type': 'static_library',
-      'variables': {
-        'jsoncpp_root': '<(third_party_dir)/jsoncpp',
-        'jsoncpp_srcs': [
-          '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
-          '<(jsoncpp_root)/src/lib_json/json_value.cpp',
-          '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
-        ],
-        'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
-        'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-      },
-      'defines': [
-        '<@(jsoncpp_additional_macros)',
-+      'conditions': [
-+        ['use_libjsoncpp==1', {
-+          'type': 'none',
-+          'variables': {
-+            'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-+          },
-+          'all_dependent_settings': {
-+            'defines': [
-+              '<@(jsoncpp_additional_macros)',
-+            ],
-+            'cflags': [
-+              '<!@(pkg-config --cflags jsoncpp)',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '<!@(pkg-config --libs-only-l jsoncpp)',
-+              ],
-+              'ldflags': [
-+                '<!@(pkg-config --libs-only-L jsoncpp)',
-+              ],
-+            }
-+          },
-+        }, {
-+          'type': 'static_library',
-+          'variables': {
-+            'jsoncpp_root': '<(third_party_dir)/jsoncpp',
-+            'jsoncpp_srcs': [
-+              '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
-+              '<(jsoncpp_root)/src/lib_json/json_value.cpp',
-+              '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
-+            ],
-+            'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
-+            'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-+          },
-+          'defines': [
-+            '<@(jsoncpp_additional_macros)',
-+          ],
-+          'sources': [
-+            '<@(jsoncpp_srcs)',
-+            'jsoncpp.h',
-+          ],
-+          'include_dirs': [
-+            '<@(jsoncpp_include_dirs)',
-+          ],
-+          'all_dependent_settings': {
-+            'defines': [
-+              '<@(jsoncpp_additional_macros)',
-+            ],
-+          },
-+        }],
-       ],
-      'sources': [
-        '<@(jsoncpp_srcs)',
-        'jsoncpp.h',
-      ],
-      'include_dirs': [
-        '<@(jsoncpp_include_dirs)',
-      ],
-      'all_dependent_settings': {
-        'defines': [
-          '<@(jsoncpp_additional_macros)',
-        ],
-      },
-     },
-   ],
- }
--- /src/net/jsoncpp.h
-+++ /src/net/jsoncpp.h
-@@ -35,7 +35,7 @@
- // Mozc basically disables C++ exception.
- #define JSON_USE_EXCEPTION 0
- #endif  // !JSON_USE_EXCEPTION
-#include "third_party/jsoncpp/include/json/json.h"
-+#include <json/json.h>
- #define MOZC_JSONCPP_JSON_H_INCLUDED
- #endif  // !MOZC_JSONCPP_JSON_H_INCLUDED
- 
--- /src/testing/testing.gyp
-+++ /src/testing/testing.gyp
-@@ -53,76 +53,111 @@
-   'targets': [
-     {
-       'target_name': 'testing',
-      'type': 'static_library',
-      'variables': {
-        'gtest_defines': [
-          'GTEST_LANG_CXX11=1',
-          'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
-        ],
-        'gtest_dir': '<(third_party_dir)/gtest/googletest',
-        'gmock_dir': '<(third_party_dir)/gtest/googlemock',
-        'conditions': [
-          ['_toolset=="target" and target_platform=="Android"', {
-            'gtest_defines': [
-              'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
-              'GTEST_HAS_CLONE=0',
-              'GTEST_HAS_GLOBAL_WSTRING=0',
-              'GTEST_HAS_POSIX_RE=0',
-              'GTEST_HAS_STD_WSTRING=0',
-              'GTEST_OS_LINUX=1',
-              'GTEST_OS_LINUX_ANDROID=1',
-            ],
-          }],
-        ],
-      },
-      'sources': [
-        '<(gmock_dir)/src/gmock-cardinalities.cc',
-        '<(gmock_dir)/src/gmock-internal-utils.cc',
-        '<(gmock_dir)/src/gmock-matchers.cc',
-        '<(gmock_dir)/src/gmock-spec-builders.cc',
-        '<(gmock_dir)/src/gmock.cc',
-        '<(gtest_dir)/src/gtest-death-test.cc',
-        '<(gtest_dir)/src/gtest-filepath.cc',
-        '<(gtest_dir)/src/gtest-port.cc',
-        '<(gtest_dir)/src/gtest-printers.cc',
-        '<(gtest_dir)/src/gtest-test-part.cc',
-        '<(gtest_dir)/src/gtest-typed-test.cc',
-        '<(gtest_dir)/src/gtest.cc',
-      ],
-      'include_dirs': [
-        '<(gmock_dir)',
-        '<(gmock_dir)/include',
-        '<(gtest_dir)',
-        '<(gtest_dir)/include',
-      ],
-      'defines': [
-        '<@(gtest_defines)',
-      ],
-      'all_dependent_settings': {
-        'defines': [
-          '<@(gtest_defines)',
-        ],
-        'include_dirs': [
-          '<(gmock_dir)/include',
-          '<(gtest_dir)/include',
-        ],
-      },
-       'conditions': [
-        ['(_toolset=="target" and compiler_target=="clang") or '
-         '(_toolset=="host" and compiler_host=="clang")', {
-          'cflags': [
-            '-Wno-missing-field-initializers',
-            '-Wno-unused-private-field',
-+        ['use_libgtest==1', {
-+          'type': 'none',
-+          'variables': {
-+            'gtest_defines': [
-+              'GTEST_LANG_CXX11=1',
-+              'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
-+            ],
-+            'conditions': [
-+              ['_toolset=="target" and target_platform=="Android"', {
-+                'gtest_defines': [
-+                  'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
-+                  'GTEST_HAS_CLONE=0',
-+                  'GTEST_HAS_GLOBAL_WSTRING=0',
-+                  'GTEST_HAS_POSIX_RE=0',
-+                  'GTEST_HAS_STD_WSTRING=0',
-+                  'GTEST_OS_LINUX=1',
-+                  'GTEST_OS_LINUX_ANDROID=1',
-+                ],
-+              }],
-+            ],
-+          },
-+          'all_dependent_settings': {
-+            'defines': [
-+              '<@(gtest_defines)',
-+            ],
-+            'link_settings': {
-+              'libraries': [
-+                '-lgmock -lgtest',
-+              ],
-+            },
-+          },
-+        }, {
-+          'type': 'static_library',
-+          'variables': {
-+            'gtest_defines': [
-+              'GTEST_LANG_CXX11=1',
-+              'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
-+            ],
-+            'gtest_dir': '<(third_party_dir)/gtest/googletest',
-+            'gmock_dir': '<(third_party_dir)/gtest/googlemock',
-+            'conditions': [
-+              ['_toolset=="target" and target_platform=="Android"', {
-+                'gtest_defines': [
-+                  'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
-+                  'GTEST_HAS_CLONE=0',
-+                  'GTEST_HAS_GLOBAL_WSTRING=0',
-+                  'GTEST_HAS_POSIX_RE=0',
-+                  'GTEST_HAS_STD_WSTRING=0',
-+                  'GTEST_OS_LINUX=1',
-+                  'GTEST_OS_LINUX_ANDROID=1',
-+                ],
-+              }],
-+            ],
-+          },
-+          'sources': [
-+            '<(gmock_dir)/src/gmock-cardinalities.cc',
-+            '<(gmock_dir)/src/gmock-internal-utils.cc',
-+            '<(gmock_dir)/src/gmock-matchers.cc',
-+            '<(gmock_dir)/src/gmock-spec-builders.cc',
-+            '<(gmock_dir)/src/gmock.cc',
-+            '<(gtest_dir)/src/gtest-death-test.cc',
-+            '<(gtest_dir)/src/gtest-filepath.cc',
-+            '<(gtest_dir)/src/gtest-port.cc',
-+            '<(gtest_dir)/src/gtest-printers.cc',
-+            '<(gtest_dir)/src/gtest-test-part.cc',
-+            '<(gtest_dir)/src/gtest-typed-test.cc',
-+            '<(gtest_dir)/src/gtest.cc',
-+          ],
-+          'include_dirs': [
-+            '<(gmock_dir)',
-+            '<(gmock_dir)/include',
-+            '<(gtest_dir)',
-+            '<(gtest_dir)/include',
-+          ],
-+          'defines': [
-+            '<@(gtest_defines)',
-           ],
-+          'all_dependent_settings': {
-+            'defines': [
-+              '<@(gtest_defines)',
-+            ],
-+            'include_dirs': [
-+              '<(gmock_dir)/include',
-+              '<(gtest_dir)/include',
-+            ],
-+          },
-+          'conditions': [
-+            ['(_toolset=="target" and compiler_target=="clang") or '
-+             '(_toolset=="host" and compiler_host=="clang")', {
-+              'cflags': [
-+                '-Wno-missing-field-initializers',
-+                '-Wno-unused-private-field',
-+              ],
-+            }],
-+          ],
-+          'xcode_settings': {
-+            # Remove the force included file.  This is not necessary for third
-+            # party libraries, and it causes a build error.
-+            'OTHER_CFLAGS!' : [
-+              '-include base/namespace.h',
-+            ],
-+          },
-         }],
-       ],
-      'xcode_settings': {
-        # Remove the force included file.  This is not necessary for third
-        # party libraries, and it causes a build error.
-        'OTHER_CFLAGS!' : [
-          '-include base/namespace.h',
-        ],
-      },
-     },
-     {
-       'target_name': 'gen_mozc_data_dir_header',
--- a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
@ -0,0 +1,22 @@
+https://github.com/google/mozc/issues/441
+
+--- /src/prediction/zero_query_dict.h
+++ /src/prediction/zero_query_dict.h
+@@ -147,6 +147,17 @@
+       return iter;
+     }
+ 
+    iterator &operator--() {
+      ptr_ -= kTokenByteSize;
+      return *this;
+    }
+
+    iterator operator--(int) {
+      const iterator tmp(ptr_, string_array_);
+      ptr_ -= kTokenByteSize;
+      return tmp;
+    }
+
+     iterator &operator-=(ptrdiff_t n) {
+       ptr_ -= n * kTokenByteSize;
+       return *this;
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@ -1,321 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/google/mozc"
-	EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
-	MOZC_GIT_REVISION="280e38fe3d9db4df52f0713acf2ca65898cd697a"
-	JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
-	JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
-	FCITX_PATCH_VERSION="2.18.2612.102.1"
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
-		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
-		fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
-
-RDEPEND=">=dev-libs/protobuf-3.0.0:=
-	emacs? ( virtual/emacs )
-	fcitx4? ( app-i18n/fcitx:4 )
-	gui? (
-		app-i18n/zinnia
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
-		handwriting-tomoe? ( app-i18n/zinnia-tomoe )
-	)
-	ibus? (
-		>=app-i18n/ibus-1.4.1
-		dev-libs/glib:2
-		x11-libs/libxcb
-	)
-	renderer? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gyp
-	dev-util/ninja
-	virtual/pkgconfig
-	test? (
-		>=dev-cpp/gtest-1.8.0
-		dev-libs/jsoncpp
-	)"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-execute() {
-	einfo "$@"
-	"$@"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-
-		if use fcitx4; then
-			local EGIT_SUBMODULES=()
-			git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
-			git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
-		fi
-	else
-		unpack ${P}.tar.gz
-		mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
-		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
-		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-	fi
-}
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
-
-	if use fcitx4; then
-		if [[ "${PV}" == "9999" ]]; then
-			cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
-		else
-			eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
-		fi
-	fi
-
-	eapply_user
-
-	sed \
-		-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
-		-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
-		-e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i build_mozc.py || die
-
-	sed \
-		-e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
-		-e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
-		-i gyp/common.gypi || die
-
-	local ar=($(tc-getAR))
-	local cc=($(tc-getCC))
-	local cxx=($(tc-getCXX))
-	local ld=($(tc-getLD))
-	local nm=($(tc-getNM))
-	local readelf=($(tc-getPROG READELF readelf))
-
-	# Use absolute paths. Non-absolute paths are mishandled by GYP.
-	ar[0]=$(type -P ${ar[0]})
-	cc[0]=$(type -P ${cc[0]})
-	cxx[0]=$(type -P ${cxx[0]})
-	ld[0]=$(type -P ${ld[0]})
-	nm[0]=$(type -P ${nm[0]})
-	readelf[0]=$(type -P ${readelf[0]})
-
-	sed \
-		-e "s:<!(which ar):${ar[@]}:" \
-		-e "s:<!(which clang):${cc[@]}:" \
-		-e "s:<!(which clang++):${cxx[@]}:" \
-		-e "s:<!(which ld):${ld[@]}:" \
-		-e "s:<!(which nm):${nm[@]}:" \
-		-e "s:<!(which readelf):${readelf[@]}:" \
-		-i gyp/common.gypi || die
-}
-
-src_configure() {
-	if use debug; then
-		BUILD_TYPE="Debug"
-	else
-		BUILD_TYPE="Release"
-	fi
-
-	local gyp_arguments=()
-
-	if tc-is-gcc; then
-		gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
-	elif tc-is-clang; then
-		gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
-	else
-		gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
-	fi
-
-	gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
-	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
-	gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
-	gyp_arguments+=(-D use_libprotobuf=1)
-	gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
-	gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
-	gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
-	gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
-	if use handwriting-tegaki; then
-		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
-	elif use handwriting-tomoe; then
-		gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
-	fi
-
-	if use ibus; then
-		gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
-		gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
-	fi
-
-	unset AR CC CXX LD NM READELF
-
-	execute "${PYTHON}" build_mozc.py gyp \
-		--gypdir="${EPREFIX}/usr/bin" \
-		--server_dir="${EPREFIX}/usr/libexec/mozc" \
-		--verbose \
-		$(usex gui "" --noqt) \
-		-- "${gyp_arguments[@]}" || die "Configuration failed"
-}
-
-src_compile() {
-	local targets=(server/server.gyp:mozc_server)
-	if use emacs; then
-		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
-	fi
-	if use fcitx4; then
-		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
-	fi
-	if use gui; then
-		targets+=(gui/gui.gyp:mozc_tool)
-	fi
-	if use ibus; then
-		targets+=(unix/ibus/ibus.gyp:ibus_mozc)
-	fi
-	if use renderer; then
-		targets+=(renderer/renderer.gyp:mozc_renderer)
-	fi
-	if use test; then
-		targets+=(gyp/tests.gyp:unittests)
-	fi
-
-	execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
-
-	if use emacs; then
-		elisp-compile unix/emacs/*.el
-	fi
-}
-
-src_test() {
-	execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/mozc
-	doexe out_linux/${BUILD_TYPE}/mozc_server
-
-	if use gui; then
-		doexe out_linux/${BUILD_TYPE}/mozc_tool
-	fi
-
-	if use renderer; then
-		doexe out_linux/${BUILD_TYPE}/mozc_renderer
-	fi
-
-	insinto /usr/libexec/mozc/documents
-	doins data/installer/credits_en.html
-
-	if use emacs; then
-		dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
-		elisp-install ${PN} unix/emacs/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
-	fi
-
-	if use fcitx4; then
-		exeinto /usr/$(get_libdir)/fcitx
-		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
-		insinto /usr/share/fcitx/addon
-		doins unix/fcitx/fcitx-mozc.conf
-
-		insinto /usr/share/fcitx/inputmethod
-		doins unix/fcitx/mozc.conf
-
-		insinto /usr/share/fcitx/mozc/icon
-		newins data/images/product_icon_32bpp-128.png mozc.png
-		local image
-		for image in data/images/unix/ui-*.png; do
-			newins "${image}" "mozc-${image#data/images/unix/ui-}"
-		done
-
-		local locale mo_file
-		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
-			locale="${mo_file##*/}"
-			locale="${locale%.mo}"
-			insinto /usr/share/locale/${locale}/LC_MESSAGES
-			newins "${mo_file}" fcitx-mozc.mo
-		done
-	fi
-
-	if use ibus; then
-		exeinto /usr/libexec
-		newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
-		insinto /usr/share/ibus/component
-		doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
-		insinto /usr/share/ibus-mozc
-		newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
-		local image
-		for image in data/images/unix/ui-*.png; do
-			newins "${image}" "${image#data/images/unix/ui-}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-
-		elog "USAGE IN EMACS"
-		elog
-		elog "mozc-mode is minor mode to input Japanese text using Mozc server."
-		elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
-		elog
-		elog "In order to use mozc-mode by default, the following settings should be added to"
-		elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
-		elog "by default) will enable mozc-mode."
-		elog
-		elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
-		elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@ -99,6 +99,7 @@ src_unpack() {

 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"

--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@ -99,6 +99,7 @@ src_unpack() {

 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"

--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@ -1 +1,5 @@
+DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
+DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
+DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
+DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
--- a/app-i18n/tagainijisho/metadata.xml
+++ b/app-i18n/tagainijisho/metadata.xml
@ -5,6 +5,10 @@
    <email>calchan@gentoo.org</email>
    <name>Denis Dupeyron</name>
  </maintainer>
+  <maintainer type="person">
+    <email>arfrever.fta@gmail.com</email>
+    <name>Arfrever Frehtes Taifersar Arahesis</name>
+  </maintainer>
  <longdescription>
 Tagaini Jisho is a free, open-source Japanese dictionary and kanji lookup tool
 that is available for Windows, MacOS X and Linux and aims at becoming your
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	JMDICT_DATE="2018-06-12"
+	KANJIDIC2_DATE="2018-06-12"
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; then
+	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; then
+	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${P}.tar.gz
+		mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	elif [[ "${PV}" == *_pre* ]]; then
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs}${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION=""
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	JMDICT_DATE=""
+	KANJIDIC2_DATE=""
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; then
+	# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+fi
+if [[ "${PV}" == *_pre* ]]; then
+	# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${P}.tar.gz
+		mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	elif [[ "${PV}" == *_pre* ]]; then
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs}${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/postfix_exporter/Manifest
+++ b/app-metrics/postfix_exporter/Manifest
@ -0,0 +1,10 @@
+DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
+DIST github.com-coreos-go-systemd-bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz 60308 BLAKE2B 0b042dae9418cae85d258f1ba029f5edf0550971583c9389a13230b08b6a164600bc9bc36392daaf85af6cd1e1140b6c3f7a8af268be1808e0fe07b5a7223efb SHA512 3469e4db9ad335443ff8da4421e790a21cf56489f8be473fdbe36dc000f6a4497ee68d0038202ab28f5cb7655212e33988ba79ad7cac39fd49f6e35f0f6b728e
+DIST github.com-coreos-pkg-97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz 32444 BLAKE2B 2601d814407a50eb19e1413228091ecac21ad76bee643e5dfd5e6cff574ddf2dad8a09a1d366f680d48a7402d2ee73eab64dda3a50c3f1be1d594d09c21fb9ed SHA512 3212abf2ec16038d9bd9705bbdaa0f905678b7ec928065f122b54926b90d629ef456c903dd020e98ee56271c82614ca54c4690bb7b258084a0d0bf8422a39d6f
+DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
+DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
+DIST github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz 106949 BLAKE2B b5ee911f6d478ae21a71c2827f541ecd174dee7dbf23fff58a517e739f0e16bf91451a6aabf3f3f786b62256e2c4ee8481cc3169d01819425d56a0eb802a36c9 SHA512 234ad2fa57751901ab2a0e5843bce17689166d8fc285d63f9de0da412cfe7176e8a9f96c0bf5342184985fbb564def31087255bf11766331636c3624fe85eb62
+DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
+DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
+DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
+DIST postfix_exporter-0.1.2.tar.gz 11552 BLAKE2B 987c81482fc984e8f6c870fdaf7ce2ef67b3fa66e5782713a645d35b76a1bde1dde97a79705569d1423a9356309d0b7240c77dba386127e8a5035990220d2a62 SHA512 579793281dedd858538ab9a931e0003cfc9989204ebf4352dd4860e5a7f62b919d77a9e0facb9daff6706771010f9e807061dace8cb88928635d55111c7c482a
--- a/app-metrics/postfix_exporter/files/postfix_exporter.confd
+++ b/app-metrics/postfix_exporter/files/postfix_exporter.confd
@ -0,0 +1,9 @@
+#  -postfix.logfile_path string
+#        Path where Postfix writes log entries. This file will be truncated by this exporter. (default "/var/log/postfix_exporter_input.log")
+#  -postfix.showq_path string
+#        Path at which Postfix places its showq socket. (default "/var/spool/postfix/public/showq")
+#  -web.listen-address string
+#        Address to listen on for web interface and telemetry. (default ":9154")
+#  -web.telemetry-path string
+#        Path under which to expose metrics. (default "/metrics")
+command_args=""
--- a/app-metrics/postfix_exporter/files/postfix_exporter.initd
+++ b/app-metrics/postfix_exporter/files/postfix_exporter.initd
@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus Exporter for Postfix Metrics"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/postfix_exporter"
+command_args="${command_args:-}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
--- a/app-metrics/postfix_exporter/files/postfix_exporter.logrotated
+++ b/app-metrics/postfix_exporter/files/postfix_exporter.logrotated
@ -0,0 +1,7 @@
+/var/log/postfix_exporter/postfix_exporter.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
--- a/app-metrics/postfix_exporter/metadata.xml
+++ b/app-metrics/postfix_exporter/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kumina/postfix_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
+++ b/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/coreos/go-systemd bebb2b01b0473b183e4624aaf8e23ae6f4b22417"
+	"github.com/coreos/pkg 97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"
+	"github.com/prometheus/client_golang f504d69affe11ec1ccb2e5948127f86878c9fd57"
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
+	"github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
+	"github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
+	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+	"github.com/prometheus/procfs 780932d4fbbe0e69b84c34c20f5c8d0981e109ea" )
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kumina/postfix_exporter"
+ARCHIVE_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus Exporter for Postfix"
+HOMEPAGE="https://github.com/kumina/postfix_exporter"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="systemd"
+
+DEPEND="systemd? ( sys-apps/systemd )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" \
+		go build -tags "$(usex systemd '' 'nosystemd')" -v -o bin/${PN} || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/bin/${PN}
+	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
+	local dir
+	for dir in /var/{lib,log}/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@ -1,2 +1,3 @@
 DIST snmp_exporter-0.10.0.tar.gz 3507371 BLAKE2B 8ad65ef8593e08fa1749013dcaf91e985df13ad12a988fb3691fed6436b979ce0edf668844240485437acbe5c19894dd52472e89dcff705a822dc633bde4d36a SHA512 70a1c6f1f3f89a68af71d6b1f2d6975c677e8c9470b9e1d5168c7fa9e60cacef808559b7d318c742704ab0358b7724e14d8583629747c118307381ba80d4bd6c
+DIST snmp_exporter-0.11.0.tar.gz 3631252 BLAKE2B 9786a17d667f8e6d45691f9df099f67ce103fbb93c9069ca497e59ff9207de05335fe3fac56d3d3bc0617069eb26a9c5b5682a8ec65c78d7e44303002427e9fa SHA512 a5d671d1bf2a98bbdb6ff85ac84ca5fe8da8d075bb1133aae650e73c45770be0403bcfea93595b2f5bc75b2e50cf96ccada0407d6956b4b5d1dc5b7ff604254a
 DIST snmp_exporter-0.9.0.tar.gz 3257207 BLAKE2B 3e7e91d7e66b32e3f84c9e53061f54ffc10116913b91598edfa011663daf2c67314661dbe6cd5b2c20b30968833bd64a48bdd5dd06694e76f1e787d59ad63933 SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1
--- a/app-metrics/snmp_exporter/snmp_exporter-0.11.0.ebuild
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.11.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/snmp_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+SNMP_EXPORTER_COMMIT="e459171"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for snmp metrics"
+HOMEPAGE="https://github.com/prometheus/snmp_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/snmp_exporter
+	dodoc {README,CONTRIBUTING}.md
+	insinto /etc/snmp_exporter
+	newins snmp.yml snmp.yml.example
+	popd || die
+	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
+	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@ -1 +1 @@
-DIST blogc-0.13.8.tar.xz 319016 BLAKE2B 60806c50a31b0595d3282cbb4de7451d19d7d1ba3cfb6bd81b299f69b494363c72d00ab02e65dde58006abb22cb9994c6c3daa7170ad84b019bb699b5a822f20 SHA512 3eb2ba937fc2449631917c3ed20382cc1988e0a6c117350980943327111ede5bb87f276ab308179f0ca61a7dabd123706473e16edab2a42373965de5a0684a61
+DIST blogc-0.13.9.tar.xz 319084 BLAKE2B 2e23e85d657e2905a94f71cebae31868a241783d44dc4da76c3bda02cf7c96c0516a834399e0b5bb66716c959acc32dac9d1374388a4e597a03dff9e8e11fef3 SHA512 9160884fd0a4088abacb9f4f3168c80a5a8b01d81a13606f3abf8c0f54b2bf0459f1c3833ab953a072eb87b8b8d8fc31467036999e85e2448fecbc36f97bb1db
--- a/app-text/blogc/blogc-0.13.9.ebuild
+++ b/app-text/blogc/blogc-0.13.9.ebuild
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -1,5 +1,6 @@
 DIST postgresql-10.3.tar.bz2 19959653 BLAKE2B ba3b05f53b0f879b18d6d0649bf819697c77a066b49d941a96d13a4741854b01aeb0c8b868d6550a08ad52572c9463c968660aa83c16cbaa5b4bf7a89387a524 SHA512 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
 DIST postgresql-10.4.tar.bz2 20201838 BLAKE2B 6d1cdc44547740c8f9fbc2e989364640409c6d2a365568b75731277dd0fba473ce07e2ee27e8ebfad507a6ce0ab3d3a44156c0e3a069d96d320771d8a97ba82f SHA512 b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663
+DIST postgresql-11beta1.tar.bz2 20945387 BLAKE2B a99aff17a656da2250309f2652237c8df3a3aeed088250be6114964c103dec40d0c4cc60b048b2ffa1e9733aed8e9df2597d57cab58482512c42f25139dc3499 SHA512 fa4e9cf8293fecf384d98d3a5bbed208eda2e4dd8bf05a9922a74355daba74dde4dbe0cd42bea1de155f4fea3cdcd0d7621d7e315c1d5f49ce5ee794b01b9f6d
 DIST postgresql-9.3.22.tar.bz2 17022938 BLAKE2B 198705e438717d0d9e12c73e0c0e3eff0ba89ea50a1b183de70f065e13c153c164890fe56bc6ec13b0cb9617df4f66894c122eeddaf9303b9a02b8e08b19b085 SHA512 667ff496172626d2fe35c6795935fb07f4f7967a3b0631dd3b96278f8dc00b3d08794f091a5ab060a45d6f2a861e0f10f0e9660f9e343ab34eeabd693104c47f
 DIST postgresql-9.3.23.tar.bz2 17033683 BLAKE2B f02ad25f6b8755a9a57c3a6dcb63b78672e29473b061ad1616be2fb97fbfd83fe0dc9fc9fda66ac0231fb30fb13f9ef8975ba5a9701d83f33495bcf2c2651b4a SHA512 bb2d54312de728aa0379ea5bc6385036bbe69d3b7f85bbd78c210840eed19ace29840849caf38d0689e21130a0c94818a362b3927805d8eded53b68e240a52b0
 DIST postgresql-9.4.17.tar.bz2 17807762 BLAKE2B 7640c29a71c6aeff47d9b43dd1e4f52edac4295b646b34da3a0ed9c26a8a826061bfd892e9907b62f31b7f01ee3aaf437c88d79b84d1d786d608dcd088309ecf SHA512 9ac03d460e521dcd142ac463dd5bb0f3e3f47333367bf8d61499ec7e8d0129d338c6f111667d0006df0c8ced9ae8a337d4c1b40eb5f55e6bc8dd5a24dfd376f0
--- a/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-11_beta1-no-server.patch
@ -0,0 +1,148 @@
+diff -Naruw a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile
+++ b/contrib/Makefile
+@@ -5,56 +5,9 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ SUBDIRS = \
+-		adminpack	\
+-		amcheck		\
+-		auth_delay	\
+-		auto_explain	\
+-		bloom		\
+-		btree_gin	\
+-		btree_gist	\
+-		citext		\
+-		cube		\
+-		dblink		\
+-		dict_int	\
+-		dict_xsyn	\
+-		earthdistance	\
+-		file_fdw	\
+-		fuzzystrmatch	\
+-		hstore		\
+-		intagg		\
+-		intarray	\
+-		isn		\
+-		lo		\
+-		ltree		\
+ 		oid2name	\
+-		pageinspect	\
+-		passwordcheck	\
+-		pg_buffercache	\
+-		pg_freespacemap \
+-		pg_prewarm	\
+-		pg_standby	\
+-		pg_stat_statements \
+-		pg_trgm		\
+-		pgcrypto	\
+-		pgrowlocks	\
+-		pgstattuple	\
+-		pg_visibility	\
+-		postgres_fdw	\
+-		seg		\
+-		spi		\
+-		tablefunc	\
+-		tcn		\
+-		test_decoding	\
+-		tsm_system_rows \
+-		tsm_system_time \
+-		unaccent	\
+ 		vacuumlo
+ 
+-ifeq ($(with_openssl),yes)
+-SUBDIRS += sslinfo
+-else
+-ALWAYS_SUBDIRS += sslinfo
+-endif
+ 
+ ifneq ($(with_uuid),no)
+ SUBDIRS += uuid-ossp
+diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile
+++ b/src/backend/Makefile
+@@ -53,7 +53,7 @@
+ 
+ ##########################################################################
+ 
+-all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP)
+all: generated-headers
+ 
+ ifneq ($(PORTNAME), cygwin)
+ ifneq ($(PORTNAME), win32)
+@@ -192,24 +192,7 @@
+ 
+ ##########################################################################
+ 
+-install: all installdirs install-bin
+-ifeq ($(PORTNAME), cygwin)
+-ifeq ($(MAKE_DLL), true)
+-	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
+-endif
+-endif
+-ifeq ($(PORTNAME), win32)
+-ifeq ($(MAKE_DLL), true)
+-	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
+-endif
+-endif
+-	$(MAKE) -C catalog install-data
+-	$(MAKE) -C tsearch install-data
+-	$(MAKE) -C utils install-data
+-	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
+-	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
+-	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
+-	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
+install:
+ 
+ ifeq ($(with_llvm), yes)
+ install-bin: install-postgres-bitcode
+diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile
+++ b/src/bin/Makefile
+@@ -14,20 +14,8 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ SUBDIRS = \
+-	initdb \
+-	pg_archivecleanup \
+-	pg_basebackup \
+ 	pg_config \
+-	pg_controldata \
+-	pg_ctl \
+ 	pg_dump \
+-	pg_resetwal \
+-	pg_rewind \
+-	pg_test_fsync \
+-	pg_test_timing \
+-	pg_upgrade \
+-	pg_verify_checksums \
+-	pg_waldump \
+ 	pgbench \
+ 	psql \
+ 	scripts
+diff -Naruw a/src/Makefile b/src/Makefile
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -15,21 +15,12 @@
+ SUBDIRS = \
+ 	common \
+ 	port \
+-	timezone \
+ 	backend \
+-	backend/utils/mb/conversion_procs \
+-	backend/snowball \
+ 	include \
+ 	interfaces \
+-	backend/replication/libpqwalreceiver \
+-	backend/replication/pgoutput \
+ 	fe_utils \
+ 	bin \
+-	pl \
+-	makefiles \
+-	test/regress \
+-	test/isolation \
+-	test/perl
+	makefiles
+ 
+ ifeq ($(with_llvm), yes)
+ SUBDIRS += backend/jit/llvm
--- a/dev-db/postgresql/postgresql-11_beta1.ebuild
+++ b/dev-db/postgresql/postgresql-11_beta1.ebuild
@ -0,0 +1,449 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
+		 zh_TW"
+
+inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT=$(get_major_version)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl python +readline
+	  selinux +server systemd ssl static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls nls "'$(l10n_get_locales)'")
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -1,3 +1,6 @@
 DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826
+DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cbf91cf4d0cb313fc9202d210ccbad5fca7f9a062ede63387e814d664f0ae38bcfa48db222f466dbcd429fecfb53cfdac155c4 SHA512 eaec866de26003ec36559aab15dd18dc0e6029453002a4eec5e176bb35a712b8b06c235436e6c1a226b67c7eb90d7a26c2b3b3d9a5e6e92a5af485236b77c878
 DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
+DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6
 DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
+DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e
--- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch
+++ b/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch
@ -0,0 +1,14 @@
+https://sqlite.org/src/info/27291f2d7fd4dadf
+
+--- /src/shell.c.in
+++ /src/shell.c.in
+@@ -5284,7 +5284,8 @@
+     "SELECT "
+     " ($dir || name),"
+     " writefile(($dir || name), %s, mode, mtime) "
+-    "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)";
+    "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"
+    " AND name NOT GLOB '*..[/\\]*'";
+ 
+   const char *azExtraArg[] = { 
+     "sqlar_uncompress(data, sz)",
--- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch
+++ b/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch
@ -0,0 +1,407 @@
+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
+@@ -309,6 +309,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 \
+@@ -357,8 +360,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
+ #
+@@ -427,7 +433,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 \
+@@ -450,8 +455,7 @@
+   $(TOP)/ext/misc/spellfix.c \
+   $(TOP)/ext/misc/totype.c \
+   $(TOP)/ext/misc/unionvtab.c \
+-  $(TOP)/ext/misc/wholenumber.c \
+-  $(TOP)/ext/misc/zipfile.c
+  $(TOP)/ext/misc/wholenumber.c
+ 
+ # Source code to the library files needed by the test fixture
+ #
+@@ -615,25 +619,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
+@@ -712,7 +716,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
+ #
+@@ -1009,14 +1013,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)/src/test_windirent.c
+ 
+ shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
+@@ -1175,15 +1174,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.
+@@ -1214,24 +1213,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 \
+@@ -1242,30 +1240,30 @@
+ 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
+ 
+-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
+ 
+-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
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1284,11 +1282,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
+@@ -590,6 +590,9 @@
+ if test "${use_loadextension}" = "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>
+@@ -2175,3 +2177,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;
+@@ -124,6 +125,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,13 +944,6 @@
+ INCLUDE ../ext/misc/shathree.c
+ INCLUDE ../ext/misc/fileio.c
+ INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.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)
+ /*
+@@ -3632,7 +3630,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,
+@@ -5523,6 +5523,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);
+@@ -8539,6 +8540,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
+--- /tool/mksqlite3c.tcl
+++ /tool/mksqlite3c.tcl
+@@ -116,6 +116,7 @@
+    rtree.h
+    sqlite3session.h
+    sqlite3.h
+   sqlite3expert.h
+    sqlite3ext.h
+    sqlite3rbu.h
+    sqliteicu.h
+@@ -401,6 +402,10 @@
+    json1.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
+ 
--- a/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch
+++ b/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch
@ -0,0 +1,14 @@
+https://sqlite.org/src/info/27291f2d7fd4dadf
+
+--- /shell.c
+++ /shell.c
+@@ -12786,7 +12786,8 @@
+     "SELECT "
+     " ($dir || name),"
+     " writefile(($dir || name), %s, mode, mtime) "
+-    "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)";
+    "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"
+    " AND name NOT GLOB '*..[/\\]*'";
+ 
+   const char *azExtraArg[] = { 
+     "sqlar_uncompress(data, sz)",
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	tcl? ( app-arch/unzip )
 	test? (
 		app-arch/unzip
-		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+		>=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}]
 	)
 	tools? ( app-arch/unzip )"

--- a/dev-db/sqlite/sqlite-3.24.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.24.0.ebuild
@ -0,0 +1,308 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${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 ~arm-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"
+
+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}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		>=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+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.24.0-full_archive-build.patch"
+		eapply "${FILESDIR}/${PN}-3.24.0-full_archive-archive_command_paths_handling.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.21.0-nonfull_archive-build.patch"
+		eapply "${FILESDIR}/${PN}-3.24.0-nonfull_archive-archive_command_paths_handling.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 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
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# 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
+
+	# 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 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
+
+	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 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() {
+	prune_libtool_files
+
+	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
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/ruby/ruby-2.3.7.ebuild
+++ b/dev-lang/ruby/ruby-2.3.7.ebuild
@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"

 RDEPEND="
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@ -28,8 +28,8 @@ DEPEND="net-mail/mailbase
 	postgres? ( dev-db/postgresql:= )
 	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	)
 	java? ( >=virtual/jdk-1.4:= )"
 RDEPEND="${DEPEND}
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@ -29,8 +29,8 @@ DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	)
 	java? ( >=virtual/jdk-1.6:= )"

--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@ -27,7 +27,7 @@ DEPEND="net-mail/mailbase
 	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
 	postgres? ( dev-db/postgresql:= )
 	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jdk-1.4:= )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-sasl )"
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.ebuild
@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
-	MY_P=${P%%_*}
-	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
-	pulseaudio?	( sound )
-	opengl?		( || ( X sdl wayland ) )
-	gles?		( || ( X wayland ) )
-	gles?		( !sdl )
-	gles?		( egl )
-	sdl?		( opengl )
-	wayland?	( egl !opengl gles )
-	xim?		( X )
-"
-
-RDEPEND="
-	drm? (
-		>=dev-libs/libinput-0.8
-		media-libs/mesa[gbm]
-		>=x11-libs/libdrm-2.4
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib )
-	glib? ( dev-libs/glib:2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	!oldlua? ( >=dev-lang/luajit-2.0.0 )
-	oldlua? ( dev-lang/lua:* )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	wayland? (
-		>=dev-libs/wayland-1.8.0
-		>=x11-libs/libxkbcommon-0.3.1
-		media-libs/mesa[gles2,wayland]
-	)
-	webp? ( media-libs/libwebp )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-	)
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	xpm? ( x11-libs/libXpm )
-
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.20.0
-	sys-libs/zlib
-	virtual/jpeg:0=
-
-	!dev-libs/ecore
-	!dev-libs/edbus
-	!dev-libs/eet
-	!dev-libs/eeze
-	!dev-libs/efreet
-	!dev-libs/eina
-	!dev-libs/eio
-	!dev-libs/embryo
-	!dev-libs/eobj
-	!dev-libs/ephysics
-	!media-libs/edje
-	!media-libs/elementary
-	!media-libs/emotion
-	!media-libs/ethumb
-	!media-libs/evas
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-#external lz4 support currently broken because of unstable ABI/API
-#	app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
-	!!dev-libs/ecore
-	!!dev-libs/edbus
-	!!dev-libs/eet
-	!!dev-libs/eeze
-	!!dev-libs/efreet
-	!!dev-libs/eina
-	!!dev-libs/eio
-	!!dev-libs/embryo
-	!!dev-libs/eobj
-	!!dev-libs/ephysics
-	!!media-libs/edje
-	!!media-libs/emotion
-	!!media-libs/ethumb
-	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	enlightenment_src_prepare
-
-	# Remove stupid sleep command.
-	# Also back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die
-
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	if use ssl && use gnutls ; then
-		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
-		einfo "gnutls has been selected for you."
-	fi
-	if use opengl && use gles ; then
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
-		einfo "opengl has been selected for you."
-	fi
-
-	E_ECONF=(
-		--with-profile=$(usex debug debug release)
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-x11=$(usex X xlib none)
-		$(use_with X x)
-		--with-opengl=$(usex opengl full $(usex gles es none))
-		--with-glib=$(usex glib)
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable drm)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable oldlua lua-old)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable png image-loader-png)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-
-		--disable-tizen
-		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
-
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
-	)
-
-	enlightenment_src_configure
-}
-
-src_compile() {
-	if host-is-pax && ! use oldlua ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@ -1 +1,2 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
+DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
--- a/dev-libs/ivykis/ivykis-0.42.3.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3.ebuild
@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@ -1 +1,2 @@
 DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
+DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
--- a/dev-libs/libdbh/libdbh-5.0.22.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="A small library to create and manage 64-bit disk based hash tables"
+HOMEPAGE="https://www.gnu.org/software/libdbh/"
+SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Make sure user defined CFLAGS are respected
+	sed -i -e 's:-O2:${CFLAGS}:' m4/rfm-conditionals.m4 || die "sed failed"
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/metadata.xml
@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@culot.org</email>
+		<name>Frederic Culot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dbh</remote-id>
 	</upstream>
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@ -16,8 +16,8 @@ IUSE="debug libressl +ssl static-libs test +threads"

 DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	)
 "
 RDEPEND="
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -16,8 +16,8 @@ RESTRICT="test"

 DEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	)
 "
 RDEPEND="
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@ -1,5 +1,3 @@
-DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
-DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
 DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
 DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
--- a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
+++ b/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
@ -1,25 +0,0 @@
-https://github.com/kkos/oniguruma/issues/68
-https://github.com/kkos/oniguruma/commit/1337755c2758a62057ef95f1cff1b9466f533301
-
--- /sample/Makefile.am
-+++ /sample/Makefile.am
-@@ -4,7 +4,7 @@
- LDADD  = $(lib_onig)
- 
- AM_LDFLAGS  = -L$(prefix)/lib
-AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
- 
- TESTS = encode listcap names posix simple sql syntax user_property bug_fix
- 
--- /test/Makefile.am
-+++ /test/Makefile.am
-@@ -3,7 +3,7 @@
- 
- AM_LDFLAGS  = -L$(prefix)/lib
- AM_CFLAGS =
-AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
- 
- TESTS = test_utf8 testc testp testcu
- 
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-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 ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
--- a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-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 ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
--- a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0/5"
-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 ~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 ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"

 S="${WORKDIR}/${MY_P}"
--- a/dev-libs/re2/re2-0.2018.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.04.01.ebuild
@ -9,7 +9,7 @@ inherit multilib-minimal toolchain-funcs
 RE2_VER=${PV#0.}
 RE2_VER=${RE2_VER//./-}

-DESCRIPTION="An efficent, principled regular expression library"
+DESCRIPTION="An efficient, principled regular expression library"
 HOMEPAGE="https://github.com/google/re2"
 SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"

--- a/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
+++ b/dev-perl/Authen-NTLM/Authen-NTLM-1.90.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An NTLM authentication module"

 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="test"

 RDEPEND=">=virtual/perl-MIME-Base64-3.00
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -15,8 +15,8 @@ IUSE="libressl"

 RDEPEND="dev-perl/Crypt-OpenSSL-Bignum
 	dev-perl/Crypt-OpenSSL-Random
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 "
 DEPEND="${RDEPEND}"

--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
@ -14,8 +14,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x
 IUSE="libressl"

 RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 "
 DEPEND="${RDEPEND}"

--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="A colletion of List utilities missing from List::Util"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Higher-order list utility functions"

 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"

 DEPEND="
--- a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild
+++ b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ DESCRIPTION="Use other catalog formats in Maketext"

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

 RDEPEND="
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@ -8,7 +8,7 @@ inherit perl-module

 DESCRIPTION='A tiny replacement for Module::Build'
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Mock a DNS Resolver object for testing"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"

 RDEPEND="dev-perl/Net-DNS"
--- a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Abstract base class for portable servers"

 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 PATCHES=(
 	"${FILESDIR}/${P}-perl526.patch"
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 ~sparc x86"
 IUSE=""

 RDEPEND=""
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.650.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.650.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""

 RDEPEND=""
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""

 RDEPEND=""
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@ -1,4 +1,3 @@
-DIST click-log-0.1.3.tar.gz 3377 BLAKE2B a45503c3d56be2356e36816282a59c83777e07a4e700a14dea926932c3a05e594720ec7cef8081efb350270fe125cdb886c2c1d44a30576598d45b0ab08eac6e SHA512 7accdd5be62c7c76ec9b862d8dc91710473a46669778f39cb7e8e5fa56020ce0bd619fbe30453338a05d87cef971916f2c4f6d5c9cb9e4982ae32e7a885bd722
-DIST click-log-0.1.4.tar.gz 9004 BLAKE2B 566084db707b4f4a0697768752455162bc585d0f2316341bd8d9aed3609336559f34bac8c5ced7317514d3f8c1b88afacd2fcd91c213918253c72af1975fa381 SHA512 0bd81c5ef8c5636b0321807f5bbfb1318480da865a5bde0235679dc053ff5ac7a662bf014cb2d444ccf8b7d840b576756536de2702ae4e43afe91a72653b678c
 DIST click-log-0.1.8.tar.gz 9277 BLAKE2B 656088998bd6753f491e21a96dbd41e02e4decf1043217863478841b258b4d6e1c0ad7ffa983d0138ffccb22206b1f9fbe47ea0dbf305036db32d9810b149b5e SHA512 35baaabc54502f203da2fee02f6f63478f4f902bf333331b6ef9ae4b9d1677020ef0dce9f24f64e6e48bfc31280b72882f7cdf1f42ecf2cd941256d2e96a40e1
 DIST click-log-0.2.1.tar.gz 10062 BLAKE2B bc973ec0a7c9b98567b13bf22cb3732dc4ee9bcabee5cbb4942b9981e78893dc5ffef92142ef02d1d013fcaca81d28d5295ebd83a705adce189f7355fbbfdf7c SHA512 4fd56d4514fe3db74fd626c20579bb4bec559e60194d1b8127007281546e94b7b3248ede4da9f896fbf3e06be97db0ac9e7fe4cfd442848fe7b8e5392eced98f
+DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
--- a/dev-python/click-log/click-log-0.1.3.ebuild
+++ b/dev-python/click-log/click-log-0.1.3.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/click"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst )
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )

 inherit distutils-r1

@ -13,9 +13,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"

-DEPEND="dev-python/click"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"

 DOCS=( README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/urllib3/urllib3-1.22.ebuild
+++ b/dev-python/urllib3/urllib3-1.22.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="test"

--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/activestorage/activestorage-5.2.0.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.0.ebuild
@ -26,6 +26,8 @@ IUSE=""

 RUBY_S="rails-${PV}/${PN}"

+DEPEND+=" test? ( app-text/mupdf ) "
+
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
@ -38,12 +40,14 @@ ruby_add_bdepend "
 		dev-ruby/test-unit:2
 		dev-ruby/mini_magick
 		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
 	)"

 all_ruby_prepare() {
 	   # Remove items from the common Gemfile that we don't need for this
 		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\)/ s:^:#:" \
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
 			-e '/dalli/ s/2.7.7/2.7.9/' \
 			-e '/:job/,/end/ s:^:#:' \
 			-e '/:test/,/^end/ s:^:#:' \
--- a/dev-ruby/bundler/bundler-1.16.1.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.1.ebuild
@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 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 ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"

 ruby_add_rdepend virtual/rubygems
--- a/dev-ruby/bundler/bundler-1.16.2.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.2.ebuild
@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"

 ruby_add_rdepend virtual/rubygems
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@ -1,3 +1,4 @@
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
 DIST ox-2.9.0.tar.gz 197666 BLAKE2B 0bc211df2c3940c64df2b0e90991e828e7403c3a1f7eb885e9464659dd33930d881fdcb6443cf5b08b27f69388525c2da99d1bb686da66937f9b288ac21f7aaa SHA512 b681f3532f22e7111f693106728bcae19a7ed2eba058cfab62d73977281093cc64833460ff64fcfecc4f1bfc115c150d0712819345b0765c6dc4b4d0d67fd59c
 DIST ox-2.9.2.tar.gz 198295 BLAKE2B cc60a0382ebe3632296b9239b8e5101f3e5a08b434923982c54f453f4d95d37180dc938c6e577834721aada11d0d00bebc12776b04e28036ea067a3064e8eaa1 SHA512 4d77eea444fa6ce07e3b9d174745071fb1b7dd053e512255b9be73d6f528e590d614c86b4b61aa03163669bd5b637a60f7aef47f223e2dd719b2e5923712e95d
+DIST ox-2.9.3.tar.gz 198296 BLAKE2B 90f3e3b159caf8aede8233d49dc67a42bf9d5d7348769f50ad042fdb54e01f2672fb3f04d6062663e35cc1819389a16457905c80891846fca859334e0f6d0863 SHA512 fb342376c5d01029ee6ec18deb10561e7e4e123707bda7f1ab4c8782beee7493a7dd3f7745c179ec04d868c9787899715edd2f74b26ad4f769b14d1e6b54da1f
--- a/dev-ruby/ox/ox-2.9.3.ebuild
+++ b/dev-ruby/ox/ox-2.9.3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@ -1,2 +1,3 @@
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
 DIST hadolint-1.7.1.tar.gz 33520 BLAKE2B e66b76135c0b69a906e8a4cb0f08b9eb53e8c5d15140f20c31894155cfdc97cdc2899f1bbf575fdbed9feea99884d88b604d0bdfd2daeed4efd6064a9e28e453 SHA512 44e952665a3fbd592397cfb251935f0129900c5c87f34dc884cdb83e668e369848c0c0c403f8d7f31fd786de84e64b5e8df4d3935309acfe8266d5621f7966de
+DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
--- a/dev-util/hadolint/hadolint-1.7.2.ebuild
+++ b/dev-util/hadolint/hadolint-1.7.2.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile Linter JavaScript API"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@ -1,4 +1,3 @@
-DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 BLAKE2B 14b1983537641dcf8ee9f61e29798ebf705a57e24c2c692f55eb8bd4ad07e48948a73420015f61dea5ca576a975dd7854c24f7559c4f4c452634191f752ae097 SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a
-DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 BLAKE2B 021bad9b9eb49dfdf60d11f8d2b03b8288ff1b5efb14d1b16d8b5afadaff2162f87c2d6a2ef24d5779fdd0110d9806dc506582bd993a02580511e50834ffb48a SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb
 DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 BLAKE2B 0d5044340945d6a5d1630c3e48790fb4f8af17b2fb9a54e14138b18891ccd9409cb6f95bf07d9061813b14a9b7449322903f4e12d0bb12211f6f4bb9383a9065 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d
 DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 BLAKE2B 8b425a726eaf62ce71b25f77ab376d04e00900ad640dddbd08f434cd0c78e6c18f41b9c7a8495711600765a3e864cbdfc2757c984290ccb76b3bc59a1ff28caa SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5
+DIST scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz 281266580 BLAKE2B dd7e38385228e5bcb5d9997324e5f9abeba8b9c1a09bb503eb0b10368df89ee48357900123e230341880356f24eb1e3138326970e4dc6bd85204a48422a464b4 SHA512 622f930b665b1187baaa416f3172dc6b48551148c6267fa251e1ab17cdc5c78cccce07371ce909e59af0202d7e9a0126aa9e1d22798e0498f217e7e541e0e1a8
--- a/dev-util/scala-ide/scala-ide-4.1.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-SRC_URI_AMD64="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86.tar.gz"
-
-DESCRIPTION="The Scala IDE"
-HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="amd64 x86"
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=">=virtual/jdk-1.6
-	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-MY_D="/opt"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}"
-}
-
-src_install() {
-	cd "${D}" || die
-	dodir "${MY_D}" || die
-	insinto "${MY_D}"
-	doins -r "${WORKDIR}"/"${P}" || die
-	insopts -m 0755
-	insinto "${MY_D}"/"${P}"
-	doins "${WORKDIR}"/"${P}"/"${PN}" || die
-	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN} || die
-}
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -16,7 +16,7 @@ SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151

 DESCRIPTION="The Scala IDE"
 HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="
 	amd64? ( ${SRC_URI_AMD64} )
 	x86? ( ${SRC_URI_X86} )
--- a/Show more
+++ b/Show more