Sync with portage [Fri Oct 12 08:58:40 MSK 2018].

6 years ago · 629274ab73
parent 0ba652ca95
commit 629274ab73
2061 changed files with 8194 additions and 16285 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/unrar/unrar-5.6.6.ebuild
+++ b/app-arch/unrar/unrar-5.6.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 CDEPEND="
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
@ -0,0 +1,26 @@
 Bug: https://bugs.gentoo.org/665286
 From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
 From: Michael Palimaka <kensington@gentoo.org>
 Date: Thu, 11 Oct 2018 23:23:08 +1100
 Subject: [PATCH] Add missing include.
 ---
 src/ui/EditorNS/languageservice.cpp | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
 index bbe03dc..9a0f212 100644
 --- a/src/ui/EditorNS/languageservice.cpp
 +++ b/src/ui/EditorNS/languageservice.cpp
@@ -6,6 +6,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 +#include <QTextStream>
 namespace EditorNS {
 -- 
 2.18.1
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -32,6 +32,8 @@ DEPEND="
 	dev-qt/qtsvg:5
 "
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 src_prepare() {
 	default
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+passthrough static-libs"
 RDEPEND=">=dev-libs/nss-3.13
--- a/app-emulation/simplevirt/Manifest
+++ b/app-emulation/simplevirt/Manifest
@ -3,4 +3,4 @@ DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d1
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
 DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
-DIST simplevirt-0.0_p20181009.tar.gz 14487 BLAKE2B ef18680c208f71686502048d611509773e5722c563b2adaa1f0020f4c36aae65550b045efdfe22f7a3fbe7600483850d3590a5be839acfdc5065e51174913a6a SHA512 7cc4de465c8a399eeb8726c112492dff56696f5ca23dd0cd28c7d6da81727dfb2c2281731ff04c42ef27a5a836599dd1f36ce84eaba96d2700955e52b75193f9
+DIST simplevirt-0.0_p20181011.tar.gz 14667 BLAKE2B 02a7ecdf9ec9983a83c31fb728fbf61ffcb2ca71683ebf24d159815314b064e465da303b5c8712b18aff3ecd1da0c5170c4aa4be365855e233497f62c44ed888 SHA512 b290cbff14a3679600ca2cadcfd17184ea789c0f1556a6f1de64679ef9983eb7988ac7ebadd0de729286d8a86dbdaab3a9f7b7bbc300780c3a28aa9920610288
--- a/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
+++ b/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
@ -14,8 +14,8 @@ EGO_VENDOR=(
 inherit linux-info golang-vcs-snapshot user
 EGO_PN="github.com/rafaelmartins/simplevirt"
-GIT_COMMIT="a1569d8a63fbed7ad200039d3b45fcad41f23f36"
+GIT_COMMIT="2427500bce5bf9b365dc601790704694cd6c772e"
-GIT_VERSION="0.0.20-a156"
+GIT_VERSION="0.0.24-2427"
 ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Simple virtual machine manager for Linux (QEMU/KVM)"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@ -1,2 +1,3 @@
 DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
--- a/app-misc/gramps/gramps-5.0.0.ebuild
+++ b/app-misc/gramps/gramps-5.0.0.ebuild
@ -0,0 +1,71 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 xdg-utils
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
 HOMEPAGE="https://gramps-project.org/"
 SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+rcs +reports exif geo postscript spell"
 RDEPEND="
 	dev-python/bsddb3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
 	dev-python/pyicu[${PYTHON_USEDEP}]
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
 	x11-libs/pango[introspection]
 	x11-misc/xdg-utils
 	reports? ( media-gfx/graphviz[postscript?] )
 	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
 "
 python_prepare_all() {
 	# Install documentation to the proper location. This can't be done
 	# easily with a patch because we substitute in the $PF variable,
 	# and that changes with every revision.
 	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_configure_all() {
 	mydistutilsargs=(
 		--resourcepath=/usr/share
 		--no-compress-manpages
 	)
 }
 python_test_all() {
 	# GRAMPS builds just fine out of tree but it confuses its test suite.
 	# The following might be an ugly hack but at least it lets the tests
 	# run properly until either I or upstream have come up with something
 	# better.
 	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
 		die "Failed to symlink build directory to source directory"
 	esetup.py test
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription lang="en">
 		GRAMPS helps you track your family tree. It allows you to store, edit,
 		and research genealogical data. GRAMPS attempts to provide all of the
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@ -1,2 +1,2 @@
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
+DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
--- a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
+++ b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch
@ -0,0 +1,29 @@
 # Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810.
 diff --git a/src/conf.c b/src/conf.c
 index f3d812d..daf2bf4 100644
 --- a/src/conf.c
 +++ b/src/conf.c
@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct
 	struct mosquitto__listener *cur_listener = &config->default_listener;
 #ifdef WITH_BRIDGE
 	char *address;
 -	int i;
 #endif
 +	int i;
 	int lineno_ext;
 	struct mosquitto__security_options *cur_security_options = NULL;
 diff --git a/src/net.c b/src/net.c
 index 7397de5..670b7e2 100644
 --- a/src/net.c
 +++ b/src/net.c
@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock)
 	fromhost(&wrap_req);
 	if(!hosts_access(&wrap_req)){
 		/* Access is denied */
 -		if(!mosquitto__socket_get_address(new_sock, address, 1024)){
 +		if(!net__socket_get_address(new_sock, address, 1024)){
 			log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address);
 		}
 		COMPAT_CLOSE(new_sock);
--- a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
--- a/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.14-r1.ebuild
@ -1,97 +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 systemd user toolchain-funcs python-any-r1
 DESCRIPTION="An Open Source MQTT v3 Broker"
 HOMEPAGE="http://mosquitto.org/"
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd websockets"
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	srv? ( net-dns/c-ares )
 	websockets? ( net-libs/libwebsockets )"
 pkg_setup() {
 	enewgroup mosquitto
 	enewuser mosquitto -1 -1 -1 mosquitto
 }
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
 	if use persistence; then
 		sed -i -e "s:^#autosave_interval:autosave_interval:" \
 			-e "s:^#persistence false$:persistence true:" \
 			-e "s:^#persistence_file:persistence_file:" \
 			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
 			mosquitto.conf || die
 	fi
 	# Remove prestripping
 	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
 		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
 	python_setup
 	python_fix_shebang test
 	eapply_user
 }
 src_configure() {
 	LIBDIR=$(get_libdir)
 	makeopts=(
 		"CC=$(tc-getCC)"
 		"LIB_SUFFIX=${LIBDIR:3}"
 		"WITH_BRIDGE=$(usex bridge)"
 		"WITH_PERSISTENCE=$(usex persistence)"
 		"WITH_SRV=$(usex srv)"
 		"WITH_TLS=$(usex ssl)"
 		"WITH_WEBSOCKETS=$(usex websockets)"
 		"WITH_WRAP=$(usex tcpd)"
 	)
 }
 src_compile() {
 	emake "${makeopts[@]}"
 }
 src_test() {
 	emake "${makeopts[@]}" test
 }
 src_install() {
 	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
 	keepdir /var/lib/mosquitto
 	fowners mosquitto:mosquitto /var/lib/mosquitto
 	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
 	doinitd "${FILESDIR}"/mosquitto
 	insinto /etc/mosquitto
 	doins mosquitto.conf
 	systemd_dounit "${FILESDIR}/mosquitto.service"
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
 		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/*
 	fi
 }
 pkg_postinst() {
 	elog ""
 	elog "The Python module has been moved out of mosquitto."
 	elog "See http://mosquitto.org/documentation/python/"
 	elog ""
 	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
 	elog ""
 	elog "    rc-update add mosquitto default"
 	elog "    or"
 	elog "    systemctl enable mosquitto"
 }
--- a/app-misc/mosquitto/mosquitto-1.4.15.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.15.ebuild
@ -1,99 +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 systemd user toolchain-funcs python-any-r1
 DESCRIPTION="An Open Source MQTT v3 Broker"
 HOMEPAGE="http://mosquitto.org/"
 SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 REQUIRED_USE="test? ( bridge )"
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	srv? ( net-dns/c-ares )
 	websockets? ( net-libs/libwebsockets )"
 _emake() {
 	LIBDIR=$(get_libdir)
 	emake \
 		CC="$(tc-getCC)" \
 		LIB_SUFFIX="${LIBDIR:3}" \
 		WITH_BRIDGE="$(usex bridge)" \
 		WITH_PERSISTENCE="$(usex persistence)" \
 		WITH_SRV="$(usex srv)" \
 		WITH_TLS="$(usex ssl)" \
 		WITH_WEBSOCKETS="$(usex websockets)" \
 		WITH_WRAP="$(usex tcpd)" \
 		"$@"
 }
 pkg_setup() {
 	enewgroup mosquitto
 	enewuser mosquitto -1 -1 -1 mosquitto
 }
 src_prepare() {
 	if use persistence; then
 		sed -i -e "/^#autosave_interval/s|^#||" \
 			-e "s|^#persistence false$|persistence true|" \
 			-e "/^#persistence_file/s|^#||" \
 			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
 			mosquitto.conf || die
 	fi
 	# Remove prestripping
 	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
 		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
 	python_setup
 	python_fix_shebang test
 	eapply_user
 }
 src_compile() {
 	_emake
 }
 src_test() {
 	_emake test
 }
 src_install() {
 	_emake DESTDIR="${D}" prefix=/usr install
 	keepdir /var/lib/mosquitto
 	fowners mosquitto:mosquitto /var/lib/mosquitto
 	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
 	doinitd "${FILESDIR}"/mosquitto
 	insinto /etc/mosquitto
 	doins mosquitto.conf
 	systemd_dounit "${FILESDIR}/mosquitto.service"
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
 		docinto "/usr/share/doc/${PF}"
 		doins -r examples
 	fi
 }
 pkg_postinst() {
 	elog ""
 	elog "The Python module has been moved out of mosquitto."
 	elog "See http://mosquitto.org/documentation/python/"
 	elog ""
 	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
 	elog ""
 	elog "    rc-update add mosquitto default"
 	elog "    or"
 	elog "    systemctl enable mosquitto"
 }
--- a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -18,13 +18,16 @@ IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 REQUIRED_USE="test? ( bridge )"
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
 	srv? ( net-dns/c-ares )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	srv? ( net-dns/c-ares )
 	websockets? ( net-libs/libwebsockets )"
-PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+PATCHES=(
 	"${FILESDIR}/${PN}-fix-conditional-tests.patch"
 	"${FILESDIR}/${P}-fix-socket_get_address.patch"
 )
 _emake() {
 	LIBDIR=$(get_libdir)
@ -60,6 +63,7 @@ src_prepare() {
 		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
 	python_setup
 	rm test/{broker,lib}/ptest.py || die
 	python_fix_shebang test
 }
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/repoman/repoman-2.3.10.ebuild
+++ b/app-portage/repoman/repoman-2.3.10.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 LICENSE="docbook"
 SLOT="4.5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@ -1 +1,2 @@
 DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
--- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils
 DESCRIPTION="Guideline Support Library implementation by Microsoft"
 HOMEPAGE="https://github.com/Microsoft/GSL"
 SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/GSL-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 # header only library
 RDEPEND=""
 DEPEND="test? ( ~dev-cpp/catch-1.11.0 )"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
 	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
 )
 src_configure() {
 	local mycmakeargs=(
 		-DGSL_TEST=$(usex test)
 	)
 	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
 	cmake-utils_src_configure
 }
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 RDEPEND="virtual/libmysqlclient:="
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
+++ b/dev-games/tiled/files/tiled-1.2.0-qt-5.11.patch
@ -0,0 +1,26 @@
 Bug: https://bugs.gentoo.org/667000
 From 1f039bc40c730cdd93df8213795bbb0fcb634dfe Mon Sep 17 00:00:00 2001
 From: Michael Palimaka <kensington@gentoo.org>
 Date: Thu, 11 Oct 2018 22:51:03 +1100
 Subject: [PATCH] Add missing include.
 ---
 src/tiled/newsfeed.cpp | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/src/tiled/newsfeed.cpp b/src/tiled/newsfeed.cpp
 index ddf988c3..2e2e12b9 100644
 --- a/src/tiled/newsfeed.cpp
 +++ b/src/tiled/newsfeed.cpp
@@ -22,6 +22,7 @@
 #include "preferences.h"
 +#include <QDebug>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QSettings>
 -- 
 2.18.1
--- a/dev-games/tiled/tiled-1.2.0.ebuild
+++ b/dev-games/tiled/tiled-1.2.0.ebuild
@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 DOCS=( AUTHORS COPYING NEWS.md README.md )
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild
+++ b/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild
@ -0,0 +1,18 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit mono-env
 DESCRIPTION="Visual Basic Compiler and Runtime"
 HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/"
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2 MIT"
 SLOT="0"
 RDEPEND="dev-lang/mono"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
--- a/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild
+++ b/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild
@ -0,0 +1,18 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit mono-env
 DESCRIPTION="Visual Basic Compiler and Runtime"
 HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/"
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2 MIT"
 SLOT="0"
 RDEPEND="dev-lang/mono"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@ -1,6 +1,4 @@
 DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a
 DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
 DIST mono-5.12.0.226.tar.bz2 213373240 BLAKE2B 6aa8d9962aa51d6a7f8f6106835cef6a4eb626d7af56a09ca185736db2535dbaffd5d97d5d0eef39001b11d41d868706be4788496c8d0036bdbad24c5f6fcc46 SHA512 f4ab3066c9a3545ace0c4af50ddbe58cf5d9ffe4895cc546669f329b91988fcfebab91a070ea46b27536040823a3bbc1bd7e5552a49769988e8271d52662c583
 DIST mono-5.14.0.177.tar.bz2 219729440 BLAKE2B c21af7f541e5fcd456faeaf654ded7937da5241feb94b0de464a880915d758791ff7a645dbcb4023e7cced7ab0854bb8da0cc246abc6ab575bb278aa58fdc8c7 SHA512 f13afbe4289e177705642f79f4236710bdc8db8e956782c5370baf22207d6713f7997ec286c7742416c8206d2da205f295437d1afcdc430628d13e32f0e87d2d
-DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4
+DIST mono-5.16.0.179.tar.bz2 231379081 BLAKE2B bdcb770d28eea953d428b8d41221bb192adf17bd677711fe17b44e2faa174d59adbe7816297c5eafa2589bb871d3bc2bb84b6e99a11df63758ff6f1b83b8814e SHA512 17d29dc19e3694abd236a50dda99ab85a215d1e88b8d6474c8b8b638dfe8a0f8d60ee3d3d5da600a861cfe6a0dda77cbf3594e9c5dd8b599c80363b4f01d9f1e
--- a/dev-lang/mono/mono-4.6.1.5-r1.ebuild
+++ b/dev-lang/mono/mono-4.6.1.5-r1.ebuild
@ -1,117 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="https://www.mono-project.com/Main_Page"
 SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="nls minimal pax_kernel xen doc"
 COMMONDEPEND="
 	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
 	ia64? ( sys-libs/libunwind )
 	nls? ( sys-devel/gettext )
 "
 RDEPEND="${COMMONDEPEND}
 	|| ( www-client/links www-client/lynx )
 "
 DEPEND="${COMMONDEPEND}
 	sys-devel/bc
 	virtual/yacc
 	pax_kernel? ( sys-apps/elfix )
 "
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
 pkg_pretend() {
 	linux-info_pkg_setup
 	if use kernel_linux; then
 		if linux_config_exists; then
 			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
 		else
 			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
 			ewarn "kernel config not found"
 			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
 			ewarn "See http://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
 }
 pkg_setup() {
 	mono-env_pkg_setup
 }
 src_prepare() {
 	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
 	# get killed in the build proces when MPROTECT is enable. #286280
 	# RANDMMAP kill the build proces to #347365
 	# use paxmark.sh to get PT/XT logic #532244
 	if use pax_kernel ; then
 		ewarn "We are disabling MPROTECT on the mono binary."
 		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
 		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
 	fi
 	# mono build system can fail otherwise
 	strip-flags
 	# Fix VB targets
 	# http://osdir.com/ml/general/2015-05/msg20808.html
 	#eapply "${FILESDIR}/add_missing_vb_portable_targets.patch"
 	# Fix build when sgen disabled
 	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
 	#eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
 	# TODO: update patch
 	# Fix atomic_add_i4 support for 32-bit ppc
 	# https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
 	#epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
 	# TODO: update patch
 	#epatch "${FILESDIR}/systemweb3.patch"
 	#epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
 	#epatch "${FILESDIR}/fix-for-bug36724.patch"
 	default
 	#eapply_user
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-silent-rules
 		$(use_with xen xen_opt)
 		--without-ikvm-native
 		--disable-dtrace
 		$(use_with doc mcs-docs)
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
 }
 multilib_src_test() {
 	cd mcs/tests || die
 	emake check
 }
 multilib_src_install() {
 	default_src_install
 	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
 	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
 	# for reference.
 	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
 	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
 }
--- a/dev-lang/mono/mono-5.14.0.177.ebuild
+++ b/dev-lang/mono/mono-5.14.0.177.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 RESTRICT="mirror"
 SLOT="0"
--- a/dev-lang/mono/mono-5.16.0.179.ebuild
+++ b/dev-lang/mono/mono-5.16.0.179.ebuild
@ -1,14 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
+
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 RESTRICT="mirror"
 SLOT="0"
 IUSE="nls minimal pax_kernel xen doc"
-inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
+#TODO: multilib-minimal support
 inherit autotools eutils linux-info mono-env flag-o-matic pax-utils
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.mono-project.com/Main_Page"
@ -69,17 +72,12 @@ src_prepare() {
 	# mono build system can fail otherwise
 	strip-flags
 	#TODO: resolve problem with newer binutils
 	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
 	#append-flags -fPIC
 	default
 	# PATCHES contains configure.ac patch
 	eautoreconf
 	multilib_copy_sources
 }
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
 		--disable-silent-rules
 		$(use_with xen xen_opt)
@ -92,12 +90,12 @@ multilib_src_configure() {
 	econf "${myeconfargs[@]}"
 }
-multilib_src_test() {
+src_test() {
 	cd mcs/tests || die
 	emake check
 }
-multilib_src_install() {
+src_install() {
 	default_src_install
 	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
--- a/dev-lang/mono/mono-5.4.1.6.ebuild
+++ b/dev-lang/mono/mono-5.4.1.6.ebuild
@ -1,109 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="https://www.mono-project.com/Main_Page"
 SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
 IUSE="nls minimal pax_kernel xen doc"
 COMMONDEPEND="
 	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
 	ia64? ( sys-libs/libunwind )
 	nls? ( sys-devel/gettext )
 "
 RDEPEND="${COMMONDEPEND}
 	|| ( www-client/links www-client/lynx )
 "
 DEPEND="${COMMONDEPEND}
 	sys-devel/bc
 	virtual/yacc
 	pax_kernel? ( sys-apps/elfix )
 	dev-util/cmake
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
 )
 #S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
 pkg_pretend() {
 	linux-info_pkg_setup
 	if use kernel_linux; then
 		if linux_config_exists; then
 			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
 		else
 			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
 			ewarn "kernel config not found"
 			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
 			ewarn "See https://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
 }
 pkg_setup() {
 	mono-env_pkg_setup
 }
 src_prepare() {
 	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
 	# get killed in the build proces when MPROTECT is enable. #286280
 	# RANDMMAP kill the build proces to #347365
 	# use paxmark.sh to get PT/XT logic #532244
 	if use pax_kernel ; then
 		ewarn "We are disabling MPROTECT on the mono binary."
 		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
 		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
 	fi
 	# mono build system can fail otherwise
 	strip-flags
 	#TODO: resolve problem with newer binutils
 	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
 	#append-flags -fPIC
 	default
 	# PATCHES contains configure.ac patch
 	eautoreconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-silent-rules
 		$(use_with xen xen_opt)
 		--without-ikvm-native
 		--disable-dtrace
 		$(use_with doc mcs-docs)
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
 }
 multilib_src_test() {
 	cd mcs/tests || die
 	emake check
 }
 multilib_src_install() {
 	default_src_install
 	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
 	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
 	# for reference.
 	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
 	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
 }
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 PATCHES=(
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,8 +1,5 @@
 DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196d2e2539fe85bc42a628f2b24ea76c298b194e8466d9218ae98218243430c8d36d73fbd32b042dd6453510361 SHA512 807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e
 DIST php-5.6.38.tar.xz 12467408 BLAKE2B d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d SHA512 66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682
 DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5
 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef SHA512 4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608
 DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90
 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d
 DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
 DIST php-7.3.0RC2.tar.xz 11924624 BLAKE2B caa2c3752e7fcf2226b8351e96277a5af071cbe13f820f4c81cd54b2e98206b403327a97a7360e6a8e1c7e11687af0ddc24b9a08ef3ac3f18cbe488469c17c35 SHA512 6fca734a4dfbd8ef85838439bc965f6d6773ba270207222b710ab75a0254f6c68378763274ba5d6cfe60b6ea14c134a64cb3ef607cc2ef86c7010bac1e282498
--- a/dev-lang/php/php-5.6.36.ebuild
+++ b/dev-lang/php/php-5.6.36.ebuild
@ -1,777 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools flag-o-matic eapi7-ver systemd
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
 SRC_URI="https://php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3.01
 	BSD
 	Zend-2.0
 	bcmath? ( LGPL-2.1+ )
 	fpm? ( BSD-2 )
 	gd? ( gd )
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
 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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"
 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
 	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql libmysqlclient mysqli nls
 	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
 	readline recode selinux +session sharedmem
 	+simplexml snmp soap sockets spell sqlite ssl
 	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
 	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 # The supported (that is, autodetected) versions of BDB are listed in
 # the ./configure script. Other versions *work*, but we need to stick to
 # the ones that can be detected to avoid a repeat of bug #564824.
 COMMON_DEPEND="
 	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
 	fpm? ( acl? ( sys-apps/acl ) )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
 	berkdb? ( || (	sys-libs/db:5.3
 					sys-libs/db:5.1
 					sys-libs/db:4.8
 					sys-libs/db:4.7
 					sys-libs/db:4.6
 					sys-libs/db:4.5 ) )
 	bzip2? ( app-arch/bzip2:0= )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
 		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib:0=
 	) )
 	coverage? ( dev-util/lcov )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
 		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib:0=
 	) )
 	firebird? ( dev-db/firebird )
 	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
 	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
 	gmp? ( dev-libs/gmp:0= )
 	iconv? ( virtual/libiconv )
 	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
 	intl? ( dev-libs/icu:= )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
 	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 	mssql? ( dev-db/freetds[mssql] )
 	libmysqlclient? (
 		mysql? ( virtual/libmysqlclient:= )
 		mysqli? ( virtual/libmysqlclient:= )
 	)
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
 	postgres? ( dev-db/postgresql:* )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline:0= )
 	recode? ( app-text/recode )
 	sharedmem? ( dev-libs/mm )
 	simplexml? ( >=dev-libs/libxml2-2.6.8 )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
 	soap? ( >=dev-libs/libxml2-2.6.8 )
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	sybase-ct? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
 	truetype? (
 		=media-libs/freetype-2*
 		>=media-libs/t1lib-5.0.0
 		!gd? (
 			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
 	)
 	unicode? ( dev-libs/oniguruma:= )
 	vpx? ( media-libs/libvpx:0= )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
 	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
 		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib:0=
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 	zip? ( sys-libs/zlib:0= )
 	zlib? ( sys-libs/zlib:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/mta
 	fpm? (
 		selinux? ( sec-policy/selinux-phpfpm )
 		systemd? ( sys-apps/systemd ) )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	>=sys-devel/bison-3.0.1
 	sys-devel/flex
 	>=sys-devel/m4-1.4.3
 	>=sys-devel/libtool-1.5.18"
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed )
 	cli? ( ^^ ( readline libedit ) )
 	truetype? ( gd zlib )
 	vpx? ( gd zlib )
 	cjk? ( gd zlib )
 	exif? ( gd zlib )
 	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
 	wddx? ( xml )
 	xmlrpc? ( || ( xml iconv ) )
 	xmlreader? ( xml )
 	xslt? ( xml )
 	ldap-sasl? ( ldap )
 	mhash? ( hash )
 	phar? ( hash )
 	recode? ( !imap !mysql !mysqli !libmysqlclient )
 	libmysqlclient? ( || (
 		mysql
 		mysqli
 		pdo
 	) )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	sharedmem? ( !threads )
 "
 PHP_MV="$(ver_cut 1)"
 php_install_ini() {
 	local phpsapi="${1}"
 	# work out where we are installing the ini file
 	php_set_ini_dir "${phpsapi}"
 	# Always install the production INI file, bug 611214.
 	local phpinisrc="php.ini-production-${phpsapi}"
 	cp php.ini-production "${phpinisrc}" || die
 	# default to /tmp for save_path, bug #282768
 	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
 	# Set the extension dir
 	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
 		-i "${phpinisrc}" || die
 	# Set the include path to point to where we want to find PEAR packages
 	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
 	dodir "${PHP_INI_DIR#${EPREFIX}}"
 	insinto "${PHP_INI_DIR#${EPREFIX}}"
 	newins "${phpinisrc}" php.ini
 	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
 	elog
 	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
 	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
 	if use opcache; then
 		elog "Adding opcache to $PHP_EXT_INI_DIR"
 		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
 			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
 		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
 			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
 	fi
 	# SAPI-specific handling
 	if [[ "${sapi}" == "fpm" ]] ; then
 		einfo "Installing FPM config file php-fpm.conf"
 		insinto "${PHP_INI_DIR#${EPREFIX}}"
 		doins sapi/fpm/php-fpm.conf
 	fi
 	dodoc php.ini-{development,production}
 }
 php_set_ini_dir() {
 	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 src_prepare() {
 	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
 	eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
 	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
 	# Change PHP branding
 	# Get the alpha/beta/rc version
 	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
 		-i configure.in || die "Unable to change PHP branding"
 	# Patch PHP to show Gentoo as the server platform
 	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
 		-i configure.in || die "Failed to fix server platform name"
 	# Prevent PHP from activating the Apache config,
 	# as we will do that ourselves
 	sed -i \
 		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
 		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
 		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
 		|| die
 	# Patch PHP to support heimdal instead of mit-krb5
 	if has_version "app-crypt/heimdal" ; then
 		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
 			|| die "Failed to fix heimdal libname"
 		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 	eapply_user
 	# Force rebuilding aclocal.m4
 	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
 	eautoreconf
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# http://bugs.php.net/bug.php?id=48795, bug #343481
 		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
 	fi
 }
 src_configure() {
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
 	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
 	local our_conf=(
 		--prefix="${PHP_DESTDIR}"
 		--mandir="${PHP_DESTDIR}/man"
 		--infodir="${PHP_DESTDIR}/info"
 		--libdir="${PHP_DESTDIR}/lib"
 		--with-libdir="$(get_libdir)"
 		--localstatedir="${EPREFIX}/var"
 		--without-pear
 		$(use_enable threads maintainer-zts)
 	)
 	our_conf+=(
 		$(use_enable bcmath bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar calendar)
 		$(use_enable coverage gcov)
 		$(use_enable ctype ctype)
 		$(use_with curl curl "${EPREFIX}/usr")
 		$(use_enable xml dom)
 		$(use_with enchant enchant "${EPREFIX}/usr")
 		$(use_enable exif exif)
 		$(use_enable fileinfo fileinfo)
 		$(use_enable filter filter)
 		$(use_enable ftp ftp)
 		$(use_with nls gettext "${EPREFIX}/usr")
 		$(use_with gmp gmp "${EPREFIX}/usr")
 		$(use_enable hash hash)
 		$(use_with mhash mhash "${EPREFIX}/usr")
 		$(use_with iconv iconv \
 			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
 		$(use_enable intl intl)
 		$(use_enable ipv6 ipv6)
 		$(use_enable json json)
 		$(use_with kerberos kerberos "${EPREFIX}/usr")
 		$(use_enable xml libxml)
 		$(use_with xml libxml-dir "${EPREFIX}/usr")
 		$(use_enable unicode mbstring)
 		$(use_with crypt mcrypt "${EPREFIX}/usr")
 		$(use_with mssql mssql "${EPREFIX}/usr")
 		$(use_with unicode onig "${EPREFIX}/usr")
 		$(use_with ssl openssl "${EPREFIX}/usr")
 		$(use_with ssl openssl-dir "${EPREFIX}/usr")
 		$(use_enable pcntl pcntl)
 		$(use_enable phar phar)
 		$(use_enable pdo pdo)
 		$(use_enable opcache opcache)
 		$(use_with postgres pgsql "${EPREFIX}/usr")
 		$(use_enable posix posix)
 		$(use_with spell pspell "${EPREFIX}/usr")
 		$(use_with recode recode "${EPREFIX}/usr")
 		$(use_enable simplexml simplexml)
 		$(use_enable sharedmem shmop)
 		$(use_with snmp snmp "${EPREFIX}/usr")
 		$(use_enable soap soap)
 		$(use_enable sockets sockets)
 		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
 		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
 		$(use_enable sysvipc sysvmsg)
 		$(use_enable sysvipc sysvsem)
 		$(use_enable sysvipc sysvshm)
 		$(use_with tidy tidy "${EPREFIX}/usr")
 		$(use_enable tokenizer tokenizer)
 		$(use_enable wddx wddx)
 		$(use_enable xml xml)
 		$(use_enable xmlreader xmlreader)
 		$(use_enable xmlwriter xmlwriter)
 		$(use_with xmlrpc xmlrpc)
 		$(use_with xslt xsl "${EPREFIX}/usr")
 		$(use_enable zip zip)
 		$(use_with zlib zlib "${EPREFIX}/usr")
 		$(use_enable debug debug)
 	)
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
 		|| use qdbm ; then
 		our_conf+=( "--enable-dba${shared}" )
 	fi
 	# DBA drivers support
 	our_conf+=(
 		$(use_with cdb cdb)
 		$(use_with berkdb db4 "${EPREFIX}/usr")
 		$(use_enable flatfile flatfile)
 		$(use_with gdbm gdbm "${EPREFIX}/usr")
 		$(use_enable inifile inifile)
 		$(use_with qdbm qdbm "${EPREFIX}/usr")
 	)
 	# Support for the GD graphics library
 	our_conf+=(
 		$(use_with truetype freetype-dir "${EPREFIX}/usr")
 		$(use_with truetype t1lib "${EPREFIX}/usr")
 		$(use_enable cjk gd-jis-conv)
 		$(use_with gd jpeg-dir "${EPREFIX}/usr")
 		$(use_with gd png-dir "${EPREFIX}/usr")
 		$(use_with xpm xpm-dir "${EPREFIX}/usr")
 		$(use_with vpx vpx-dir "${EPREFIX}/usr")
 	)
 	# enable gd last, so configure can pick up the previous settings
 	our_conf+=( $(use_with gd gd) )
 	# IMAP support
 	if use imap ; then
 		our_conf+=(
 			$(use_with imap imap "${EPREFIX}/usr")
 			$(use_with ssl imap-ssl "${EPREFIX}/usr")
 		)
 	fi
 	# Interbase/firebird support
 	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
 	# LDAP support
 	if use ldap ; then
 		our_conf+=(
 			$(use_with ldap ldap "${EPREFIX}/usr")
 			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
 		)
 	fi
 	# MySQL support
 	local mysqllib="mysqlnd"
 	local mysqlilib="mysqlnd"
 	use libmysqlclient && mysqllib="${EPREFIX}/usr"
 	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
 	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
 	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
 	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
 	if use mysql || use mysqli ; then
 		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
 	fi
 	# ODBC support
 	our_conf+=(
 		$(use_with odbc unixODBC "${EPREFIX}/usr")
 		$(use_with iodbc iodbc "${EPREFIX}/usr")
 	)
 	# Oracle support
 	our_conf+=( $(use_with oci8-instant-client oci8) )
 	# PDO support
 	if use pdo ; then
 		our_conf+=(
 			$(use_with mssql pdo-dblib)
 			$(use_with mysql pdo-mysql "${mysqllib}")
 			$(use_with postgres pdo-pgsql)
 			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
 			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
 			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
 			$(use_with oci8-instant-client pdo-oci)
 		)
 	fi
 	# readline/libedit support
 	our_conf+=(
 		$(use_with readline readline "${EPREFIX}/usr")
 		$(use_with libedit libedit "${EPREFIX}/usr")
 	)
 	# Session support
 	if use session ; then
 		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
 	else
 		our_conf+=( $(use_enable session session) )
 	fi
 	# Use pic for shared modules such as apache2's mod_php
 	our_conf+=( --with-pic )
 	# we use the system copy of pcre
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
 	our_conf+=(
 		--with-pcre-regex="${EPREFIX}/usr"
 		--with-pcre-dir="${EPREFIX}/usr"
 	)
 	# Catch CFLAGS problems
 	# Fixes bug #14067.
 	# Changed order to run it in reverse for bug #32022 and #12021.
 	replace-cpu-flags "k6*" "i586"
 	# Cache the ./configure test results between SAPIs.
 	our_conf+=( --cache-file="${T}/config.cache" )
 	# Support user-passed configuration parameters
 	our_conf+=( ${EXTRA_ECONF:-} )
 	# Support the Apache2 extras, they must be set globally for all
 	# SAPIs to work correctly, especially for external PHP extensions
 	mkdir -p "${WORKDIR}/sapis-build" || die
 	for one_sapi in $SAPIS ; do
 		use "${one_sapi}" || continue
 		php_set_ini_dir "${one_sapi}"
 		# The BUILD_DIR variable is used to determine where to output
 		# the files that autotools creates. This was all originally
 		# based on the autotools-utils eclass.
 		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
 		cp -a "${S}" "${BUILD_DIR}" || die
 		cd "${BUILD_DIR}" || die
 		local sapi_conf=(
 			--with-config-file-path="${PHP_INI_DIR}"
 			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
 		)
 		for sapi in $SAPIS ; do
 			case "$sapi" in
 				cli|cgi|embed|fpm)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( "--enable-${sapi}" )
 						if [[ "fpm" == "${sapi}" ]] ; then
 							sapi_conf+=(
 								$(use_with acl fpm-acl)
 								$(use_with systemd fpm-systemd)
 							)
 						fi
 					else
 						sapi_conf+=( "--disable-${sapi}" )
 					fi
 					;;
 				apache2)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
 					else
 						sapi_conf+=( --without-apxs2 )
 					fi
 					;;
 			esac
 		done
 		# Construct the $myeconfargs array by concatenating $our_conf
 		# (the common args) and $sapi_conf (the SAPI-specific args).
 		local myeconfargs=( "${our_conf[@]}" )
 		myeconfargs+=( "${sapi_conf[@]}" )
 		pushd "${BUILD_DIR}" > /dev/null || die
 		econf "${myeconfargs[@]}"
 		popd > /dev/null || die
 	done
 }
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
 			cd "${WORKDIR}/sapis-build/$sapi" || \
 				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
 			emake
 		fi
 	done
 }
 src_install() {
 	# see bug #324739 for what happens when we don't have that
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
 	for sapi in $SAPIS ; do
 		if use $sapi ; then
 			first_sapi=$sapi
 			break
 		fi
 	done
 	# Makefile forgets to create this before trying to write to it...
 	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
 	# Install php environment (without any sapis)
 	cd "${WORKDIR}/sapis-build/$first_sapi" || die
 	emake INSTALL_ROOT="${D}" \
 		install-build install-headers install-programs
 	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
 	# Create the directory where we'll put version-specific php scripts
 	keepdir "/usr/share/php${PHP_MV}"
 	local sapi="", file=""
 	local sapi_list=""
 	for sapi in ${SAPIS}; do
 		if use "${sapi}" ; then
 			einfo "Installing SAPI: ${sapi}"
 			cd "${WORKDIR}/sapis-build/${sapi}" || die
 			if [[ "${sapi}" == "apache2" ]] ; then
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
 				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
 				newins ".libs/libphp5$(get_libname)" \
 					   "libphp${PHP_MV}$(get_libname)"
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
 				# needed each time, php_install_ini would reset it
 				local dest="${PHP_DESTDIR#${EPREFIX}}"
 				into "${dest}"
 				case "$sapi" in
 					cli)
 						source="sapi/cli/php"
 						;;
 					cgi)
 						source="sapi/cgi/php-cgi"
 						;;
 					fpm)
 						source="sapi/fpm/php-fpm"
 						;;
 					embed)
 						source="libs/libphp${PHP_MV}$(get_libname)"
 						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
 				esac
 				if [[ "${source}" == *"$(get_libname)" ]]; then
 					dolib.so "${source}"
 				else
 					dobin "${source}"
 					local name="$(basename ${source})"
 					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
 				fi
 			fi
 			php_install_ini "${sapi}"
 			# construct correct SAPI string for php-config
 			# thanks to ferringb for the bash voodoo
 			if [[ "${sapi}" == "apache2" ]]; then
 				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
 			else
 				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
 			fi
 		fi
 	done
 	# Installing opcache module
 	if use opcache ; then
 		into "${PHP_DESTDIR#${EPREFIX}}"
 		dolib.so "modules/opcache$(get_libname)"
 	fi
 	# Install env.d files
 	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	# set php-config variable correctly (bug #278439)
 	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
 		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
 	if use fpm ; then
 		if use systemd; then
 			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
 							"php-fpm@${SLOT}.service"
 		else
 			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
 							"php-fpm@${SLOT}.service"
 		fi
 	fi
 }
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
 	if [[ ! -x "${PHP_BIN}" ]] ; then
 		ewarn "Test phase requires USE=cli, skipping"
 		return
 	else
 		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi
 	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
 		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
 	fi
 	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
 					  "session.save_path=${T}" \
 					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
 					  "session.save_path=${T}"
 	for name in ${EXPECTED_TEST_FAILURES}; do
 		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
 	done
 	local failed="$(find -name '*.out')"
 	if [[ ${failed} != "" ]] ; then
 		ewarn "The following test cases failed unexpectedly:"
 		for name in ${failed}; do
 			ewarn "  ${name/.out/}"
 		done
 	else
 		einfo "No unexpected test failures, all fine"
 	fi
 	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
 		local passed=""
 		for name in ${EXPECTED_TEST_FAILURES}; do
 			[[ -f "${name}.diff" ]] && continue
 			passed="${passed} ${name}"
 		done
 		if [[ ${passed} != "" ]] ; then
 			einfo "The following test cases passed unexpectedly:"
 			for name in ${passed}; do
 				ewarn "  ${passed}"
 			done
 		else
 			einfo "None of the known-to-fail tests passed, all fine"
 		fi
 	fi
 }
 pkg_postinst() {
 	# Output some general info to the user
 	if use apache2 ; then
 		elog
 		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
 		elog "your apache2 command. OpenRC users can append that string to"
 		elog "APACHE2_OPTS in /etc/conf.d/apache2."
 		elog
 		elog "The apache module configuration file 70_mod_php.conf is"
 		elog "provided (and maintained) by eselect-php."
 		elog
 	fi
 	# Create the symlinks for php
 	for m in ${SAPIS}; do
 		[[ ${m} == 'embed' ]] && continue;
 		if use $m ; then
 			local ci=$(eselect php show $m)
 			if [[ -z $ci ]]; then
 				eselect php set $m php${SLOT} || die
 				einfo "Switched ${m} to use php:${SLOT}"
 				einfo
 			elif [[ $ci != "php${SLOT}" ]] ; then
 				elog "To switch $m to use php:${SLOT}, run"
 				elog "    eselect php set $m php${SLOT}"
 				elog
 			fi
 		fi
 	done
 	# Remove dead symlinks for SAPIs that were just disabled. For
 	# example, if the user has the cgi SAPI enabled, then he has an
 	# eselect-php symlink for it. If he later reinstalls PHP with
 	# USE="-cgi", that symlink will break. This call to eselect is
 	# supposed to remove that dead link per bug 572436.
 	eselect php cleanup || die
 	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
 	   elog "To build extensions for this version of PHP, you will need to"
 	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
 	   elog
 	fi
 	# Warn about the removal of PHP_INI_VERSION if the user has it set.
 	if [[ -n "${PHP_INI_VERSION}" ]]; then
 		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
 		ewarn 'remove it from your configuration at your convenience. See'
 		ewarn
 		ewarn '  https://bugs.gentoo.org/611214'
 		ewarn
 		ewarn 'for more information.'
 	fi
 	elog "For details on how version slotting works, please see"
 	elog "the wiki:"
 	elog
 	elog "  https://wiki.gentoo.org/wiki/PHP"
 	elog
 }
 pkg_postrm() {
 	# This serves two purposes. First, if we have just removed the last
 	# installed version of PHP, then this will remove any dead symlinks
 	# belonging to eselect-php. Second, if a user upgrades slots from
 	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
 	# his existing symlinks to point to the new 7.0 installation. The
 	# latter is bug 432962.
 	#
 	# Note: the eselect-php package may not be installed at this point,
 	# so we can't die() if this command fails.
 	eselect php cleanup
 }
--- a/dev-lang/php/php-5.6.38.ebuild
+++ b/dev-lang/php/php-5.6.38.ebuild
@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
-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"
+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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@ -1,751 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit flag-o-matic eapi7-ver systemd
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
 SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3.01
 	BSD
 	Zend-2.0
 	bcmath? ( LGPL-2.1+ )
 	fpm? ( BSD-2 )
 	gd? ( gd )
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
 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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"
 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
 	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql mysqli nls
 	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
 	readline recode selinux +session sharedmem
 	+simplexml snmp soap sockets spell sqlite ssl
 	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
 	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 # The supported (that is, autodetected) versions of BDB are listed in
 # the ./configure script. Other versions *work*, but we need to stick to
 # the ones that can be detected to avoid a repeat of bug #564824.
 COMMON_DEPEND="
 	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
 	fpm? ( acl? ( sys-apps/acl ) )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
 	berkdb? ( || ( sys-libs/db:5.3
 					sys-libs/db:5.1
 					sys-libs/db:4.8
 					sys-libs/db:4.7
 					sys-libs/db:4.6
 					sys-libs/db:4.5 ) )
 	bzip2? ( app-arch/bzip2:0= )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	cjk? ( !gd? (
 		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib:0=
 	) )
 	coverage? ( dev-util/lcov )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	exif? ( !gd? (
 		virtual/jpeg:0
 		media-libs/libpng:0=
 		sys-libs/zlib:0=
 	) )
 	firebird? ( dev-db/firebird )
 	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
 	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
 	gmp? ( dev-libs/gmp:0= )
 	iconv? ( virtual/libiconv )
 	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
 	intl? ( dev-libs/icu:= )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
 	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 	mssql? ( dev-db/freetds[mssql] )
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
 	postgres? ( dev-db/postgresql:* )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline:0= )
 	recode? ( app-text/recode )
 	sharedmem? ( dev-libs/mm )
 	simplexml? ( >=dev-libs/libxml2-2.6.8 )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
 	soap? ( >=dev-libs/libxml2-2.6.8 )
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	tidy? ( app-text/htmltidy )
 	truetype? (
 		=media-libs/freetype-2*
 		!gd? (
 			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
 	)
 	unicode? ( dev-libs/oniguruma:= )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	webp? ( media-libs/libwebp:0= )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
 	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? (
 		x11-libs/libXpm
 		virtual/jpeg:0
 		media-libs/libpng:0= sys-libs/zlib:0=
 	)
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 	zip? ( sys-libs/zlib:0= )
 	zlib? ( sys-libs/zlib:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/mta
 	fpm? (
 		selinux? ( sec-policy/selinux-phpfpm )
 		systemd? ( sys-apps/systemd ) )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	>=sys-devel/bison-3.0.1
 	sys-devel/flex
 	>=sys-devel/m4-1.4.3
 	>=sys-devel/libtool-1.5.18"
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
 	truetype? ( gd zlib )
 	webp? ( gd zlib )
 	cjk? ( gd zlib )
 	exif? ( gd zlib )
 	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
 	wddx? ( xml )
 	xmlrpc? ( || ( xml iconv ) )
 	xmlreader? ( xml )
 	xslt? ( xml )
 	ldap-sasl? ( ldap )
 	mhash? ( hash )
 	phar? ( hash )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysqli !mysql )
 	sharedmem? ( !threads )
 	mysql? ( || ( mysqli pdo ) )
 "
 PATCHES=(
 	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
 	# hopefully upstream will include the same version check fixes in upcoming releases
 	# patch added 20180429
 	"${FILESDIR}/libressl-compatibility.patch"
 	"${FILESDIR}/php-freetype-2.9.1.patch"
 )
 PHP_MV="$(ver_cut 1)"
 php_install_ini() {
 	local phpsapi="${1}"
 	# work out where we are installing the ini file
 	php_set_ini_dir "${phpsapi}"
 	# Always install the production INI file, bug 611214.
 	local phpinisrc="php.ini-production-${phpsapi}"
 	cp php.ini-production "${phpinisrc}" || die
 	# default to /tmp for save_path, bug #282768
 	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
 	# Set the extension dir
 	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
 		-i "${phpinisrc}" || die
 	# Set the include path to point to where we want to find PEAR packages
 	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
 	dodir "${PHP_INI_DIR#${EPREFIX}}"
 	insinto "${PHP_INI_DIR#${EPREFIX}}"
 	newins "${phpinisrc}" php.ini
 	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
 	elog
 	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
 	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
 	if use opcache; then
 		elog "Adding opcache to $PHP_EXT_INI_DIR"
 		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
 			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
 		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
 			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
 	fi
 	# SAPI-specific handling
 	if [[ "${sapi}" == "fpm" ]] ; then
 		einfo "Installing FPM config files php-fpm.conf and www.conf"
 		insinto "${PHP_INI_DIR#${EPREFIX}}"
 		doins sapi/fpm/php-fpm.conf
 		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
 		doins sapi/fpm/www.conf
 	fi
 	dodoc php.ini-{development,production}
 }
 php_set_ini_dir() {
 	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 src_prepare() {
 	default
 	# In php-7.x, the FPM pool configuration files have been split off
 	# of the main config. By default the pool config files go in
 	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
 	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
 	# we'll install the pool configuration file "www.conf" there.
 	php_set_ini_dir fpm
 	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
 		sapi/fpm/php-fpm.conf.in \
 		|| die 'failed to move the include directory in php-fpm.conf'
 }
 src_configure() {
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
 	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
 	local our_conf=(
 		--prefix="${PHP_DESTDIR}"
 		--mandir="${PHP_DESTDIR}/man"
 		--infodir="${PHP_DESTDIR}/info"
 		--libdir="${PHP_DESTDIR}/lib"
 		--with-libdir="$(get_libdir)"
 		--localstatedir="${EPREFIX}/var"
 		--without-pear
 		$(use_enable threads maintainer-zts)
 	)
 	our_conf+=(
 		$(use_enable bcmath bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar calendar)
 		$(use_enable coverage gcov)
 		$(use_enable ctype ctype)
 		$(use_with curl curl "${EPREFIX}/usr")
 		$(use_enable xml dom)
 		$(use_with enchant enchant "${EPREFIX}/usr")
 		$(use_enable exif exif)
 		$(use_enable fileinfo fileinfo)
 		$(use_enable filter filter)
 		$(use_enable ftp ftp)
 		$(use_with nls gettext "${EPREFIX}/usr")
 		$(use_with gmp gmp "${EPREFIX}/usr")
 		$(use_enable hash hash)
 		$(use_with mhash mhash "${EPREFIX}/usr")
 		$(use_with iconv iconv \
 			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
 		$(use_enable intl intl)
 		$(use_enable ipv6 ipv6)
 		$(use_enable json json)
 		$(use_with kerberos kerberos "${EPREFIX}/usr")
 		$(use_enable xml libxml)
 		$(use_with xml libxml-dir "${EPREFIX}/usr")
 		$(use_enable unicode mbstring)
 		$(use_with crypt mcrypt "${EPREFIX}/usr")
 		$(use_with unicode onig "${EPREFIX}/usr")
 		$(use_with ssl openssl "${EPREFIX}/usr")
 		$(use_with ssl openssl-dir "${EPREFIX}/usr")
 		$(use_enable pcntl pcntl)
 		$(use_enable phar phar)
 		$(use_enable pdo pdo)
 		$(use_enable opcache opcache)
 		$(use_with postgres pgsql "${EPREFIX}/usr")
 		$(use_enable posix posix)
 		$(use_with spell pspell "${EPREFIX}/usr")
 		$(use_with recode recode "${EPREFIX}/usr")
 		$(use_enable simplexml simplexml)
 		$(use_enable sharedmem shmop)
 		$(use_with snmp snmp "${EPREFIX}/usr")
 		$(use_enable soap soap)
 		$(use_enable sockets sockets)
 		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
 		$(use_enable sysvipc sysvmsg)
 		$(use_enable sysvipc sysvsem)
 		$(use_enable sysvipc sysvshm)
 		$(use_with tidy tidy "${EPREFIX}/usr")
 		$(use_enable tokenizer tokenizer)
 		$(use_enable wddx wddx)
 		$(use_enable xml xml)
 		$(use_enable xmlreader xmlreader)
 		$(use_enable xmlwriter xmlwriter)
 		$(use_with xmlrpc xmlrpc)
 		$(use_with xslt xsl "${EPREFIX}/usr")
 		$(use_enable zip zip)
 		$(use_with zlib zlib "${EPREFIX}/usr")
 		$(use_enable debug debug)
 	)
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
 		|| use qdbm ; then
 		our_conf+=( "--enable-dba${shared}" )
 	fi
 	# DBA drivers support
 	our_conf+=(
 		$(use_with cdb cdb)
 		$(use_with berkdb db4 "${EPREFIX}/usr")
 		$(use_enable flatfile flatfile)
 		$(use_with gdbm gdbm "${EPREFIX}/usr")
 		$(use_enable inifile inifile)
 		$(use_with qdbm qdbm "${EPREFIX}/usr")
 	)
 	# Support for the GD graphics library
 	our_conf+=(
 		$(use_with truetype freetype-dir "${EPREFIX}/usr")
 		$(use_enable cjk gd-jis-conv)
 		$(use_with gd jpeg-dir "${EPREFIX}/usr")
 		$(use_with gd png-dir "${EPREFIX}/usr")
 		$(use_with xpm xpm-dir "${EPREFIX}/usr")
 	)
 	if use webp; then
 		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
 	fi
 	# enable gd last, so configure can pick up the previous settings
 	our_conf+=( $(use_with gd gd) )
 	# IMAP support
 	if use imap ; then
 		our_conf+=(
 			$(use_with imap imap "${EPREFIX}/usr")
 			$(use_with ssl imap-ssl "${EPREFIX}/usr")
 		)
 	fi
 	# Interbase/firebird support
 	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
 	# LDAP support
 	if use ldap ; then
 		our_conf+=(
 			$(use_with ldap ldap "${EPREFIX}/usr")
 			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
 		)
 	fi
 	# MySQL support
 	local mysqllib="mysqlnd"
 	local mysqlilib="mysqlnd"
 	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
 	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
 	if use mysql || use mysqli ; then
 		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
 	fi
 	# ODBC support
 	our_conf+=(
 		$(use_with odbc unixODBC "${EPREFIX}/usr")
 		$(use_with iodbc iodbc "${EPREFIX}/usr")
 	)
 	# Oracle support
 	our_conf+=( $(use_with oci8-instant-client oci8) )
 	# PDO support
 	if use pdo ; then
 		our_conf+=(
 			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
 			$(use_with mysql pdo-mysql "${mysqllib}")
 			$(use_with postgres pdo-pgsql)
 			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
 			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
 			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
 			$(use_with oci8-instant-client pdo-oci)
 		)
 	fi
 	# readline/libedit support
 	our_conf+=(
 		$(use_with readline readline "${EPREFIX}/usr")
 		$(use_with libedit libedit "${EPREFIX}/usr")
 	)
 	# Session support
 	if use session ; then
 		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
 	else
 		our_conf+=( $(use_enable session session) )
 	fi
 	# Use pic for shared modules such as apache2's mod_php
 	our_conf+=( --with-pic )
 	# we use the system copy of pcre
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
 	our_conf+=(
 		--with-pcre-regex="${EPREFIX}/usr"
 		--with-pcre-dir="${EPREFIX}/usr"
 	)
 	# Catch CFLAGS problems
 	# Fixes bug #14067.
 	# Changed order to run it in reverse for bug #32022 and #12021.
 	replace-cpu-flags "k6*" "i586"
 	# Cache the ./configure test results between SAPIs.
 	our_conf+=( --cache-file="${T}/config.cache" )
 	# Support user-passed configuration parameters
 	our_conf+=( ${EXTRA_ECONF:-} )
 	# Support the Apache2 extras, they must be set globally for all
 	# SAPIs to work correctly, especially for external PHP extensions
 	mkdir -p "${WORKDIR}/sapis-build" || die
 	for one_sapi in $SAPIS ; do
 		use "${one_sapi}" || continue
 		php_set_ini_dir "${one_sapi}"
 		# The BUILD_DIR variable is used to determine where to output
 		# the files that autotools creates. This was all originally
 		# based on the autotools-utils eclass.
 		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
 		cp -a "${S}" "${BUILD_DIR}" || die
 		cd "${BUILD_DIR}" || die
 		local sapi_conf=(
 			--with-config-file-path="${PHP_INI_DIR}"
 			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
 		)
 		for sapi in $SAPIS ; do
 			case "$sapi" in
 				cli|cgi|embed|fpm|phpdbg)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( "--enable-${sapi}" )
 						if [[ "fpm" == "${sapi}" ]] ; then
 							sapi_conf+=(
 								$(use_with acl fpm-acl)
 								$(use_with systemd fpm-systemd)
 							)
 						fi
 					else
 						sapi_conf+=( "--disable-${sapi}" )
 					fi
 					;;
 				apache2)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
 					else
 						sapi_conf+=( --without-apxs2 )
 					fi
 					;;
 			esac
 		done
 		# Construct the $myeconfargs array by concatenating $our_conf
 		# (the common args) and $sapi_conf (the SAPI-specific args).
 		local myeconfargs=( "${our_conf[@]}" )
 		myeconfargs+=( "${sapi_conf[@]}" )
 		pushd "${BUILD_DIR}" > /dev/null || die
 		econf "${myeconfargs[@]}"
 		popd > /dev/null || die
 	done
 }
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
 			cd "${WORKDIR}/sapis-build/$sapi" || \
 				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
 			emake
 		fi
 	done
 }
 src_install() {
 	# see bug #324739 for what happens when we don't have that
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
 	for sapi in $SAPIS ; do
 		if use $sapi ; then
 			first_sapi=$sapi
 			break
 		fi
 	done
 	# Makefile forgets to create this before trying to write to it...
 	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
 	# Install php environment (without any sapis)
 	cd "${WORKDIR}/sapis-build/$first_sapi" || die
 	emake INSTALL_ROOT="${D}" \
 		install-build install-headers install-programs
 	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
 	# Create the directory where we'll put version-specific php scripts
 	keepdir "/usr/share/php${PHP_MV}"
 	local sapi="", file=""
 	local sapi_list=""
 	for sapi in ${SAPIS}; do
 		if use "${sapi}" ; then
 			einfo "Installing SAPI: ${sapi}"
 			cd "${WORKDIR}/sapis-build/${sapi}" || die
 			if [[ "${sapi}" == "apache2" ]] ; then
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
 				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
 				newins ".libs/libphp${PHP_MV}$(get_libname)" \
 					   "libphp${PHP_MV}$(get_libname)"
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
 				# needed each time, php_install_ini would reset it
 				local dest="${PHP_DESTDIR#${EPREFIX}}"
 				into "${dest}"
 				case "$sapi" in
 					cli)
 						source="sapi/cli/php"
 						;;
 					cgi)
 						source="sapi/cgi/php-cgi"
 						;;
 					fpm)
 						source="sapi/fpm/php-fpm"
 						;;
 					embed)
 						source="libs/libphp${PHP_MV}$(get_libname)"
 						;;
 					phpdbg)
 						source="sapi/phpdbg/phpdbg"
 						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
 				esac
 				if [[ "${source}" == *"$(get_libname)" ]]; then
 					dolib.so "${source}"
 				else
 					dobin "${source}"
 					local name="$(basename ${source})"
 					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
 				fi
 			fi
 			php_install_ini "${sapi}"
 			# construct correct SAPI string for php-config
 			# thanks to ferringb for the bash voodoo
 			if [[ "${sapi}" == "apache2" ]]; then
 				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
 			else
 				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
 			fi
 		fi
 	done
 	# Installing opcache module
 	if use opcache ; then
 		into "${PHP_DESTDIR#${EPREFIX}}"
 		dolib.so "modules/opcache$(get_libname)"
 	fi
 	# Install env.d files
 	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	# set php-config variable correctly (bug #278439)
 	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
 		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
 	if use fpm ; then
 		if use systemd; then
 			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
 							"php-fpm@${SLOT}.service"
 		else
 			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
 							"php-fpm@${SLOT}.service"
 		fi
 	fi
 }
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
 	if [[ ! -x "${PHP_BIN}" ]] ; then
 		ewarn "Test phase requires USE=cli, skipping"
 		return
 	else
 		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi
 	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
 		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
 	fi
 	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
 		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
 	fi
 	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
 					  "session.save_path=${T}" \
 					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
 					  "session.save_path=${T}"
 	for name in ${EXPECTED_TEST_FAILURES}; do
 		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
 	done
 	local failed="$(find -name '*.out')"
 	if [[ ${failed} != "" ]] ; then
 		ewarn "The following test cases failed unexpectedly:"
 		for name in ${failed}; do
 			ewarn "  ${name/.out/}"
 		done
 	else
 		einfo "No unexpected test failures, all fine"
 	fi
 	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
 		local passed=""
 		for name in ${EXPECTED_TEST_FAILURES}; do
 			[[ -f "${name}.diff" ]] && continue
 			passed="${passed} ${name}"
 		done
 		if [[ ${passed} != "" ]] ; then
 			einfo "The following test cases passed unexpectedly:"
 			for name in ${passed}; do
 				ewarn "  ${passed}"
 			done
 		else
 			einfo "None of the known-to-fail tests passed, all fine"
 		fi
 	fi
 }
 pkg_postinst() {
 	# Output some general info to the user
 	if use apache2 ; then
 		elog
 		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
 		elog "your apache2 command. OpenRC users can append that string to"
 		elog "APACHE2_OPTS in /etc/conf.d/apache2."
 		elog
 		elog "The apache module configuration file 70_mod_php.conf is"
 		elog "provided (and maintained) by eselect-php."
 		elog
 	fi
 	# Create the symlinks for php
 	for m in ${SAPIS}; do
 		[[ ${m} == 'embed' ]] && continue;
 		if use $m ; then
 			local ci=$(eselect php show $m)
 			if [[ -z $ci ]]; then
 				eselect php set $m php${SLOT} || die
 				einfo "Switched ${m} to use php:${SLOT}"
 				einfo
 			elif [[ $ci != "php${SLOT}" ]] ; then
 				elog "To switch $m to use php:${SLOT}, run"
 				elog "    eselect php set $m php${SLOT}"
 				elog
 			fi
 		fi
 	done
 	# Remove dead symlinks for SAPIs that were just disabled. For
 	# example, if the user has the cgi SAPI enabled, then he has an
 	# eselect-php symlink for it. If he later reinstalls PHP with
 	# USE="-cgi", that symlink will break. This call to eselect is
 	# supposed to remove that dead link per bug 572436.
 	eselect php cleanup || die
 	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
 	   elog "To build extensions for this version of PHP, you will need to"
 	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
 	   elog
 	fi
 	# Warn about the removal of PHP_INI_VERSION if the user has it set.
 	if [[ -n "${PHP_INI_VERSION}" ]]; then
 		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
 		ewarn 'remove it from your configuration at your convenience. See'
 		ewarn
 		ewarn '  https://bugs.gentoo.org/611214'
 		ewarn
 		ewarn 'for more information.'
 	fi
 	elog "For details on how version slotting works, please see"
 	elog "the wiki:"
 	elog
 	elog "  https://wiki.gentoo.org/wiki/PHP"
 	elog
 }
 pkg_postrm() {
 	# This serves two purposes. First, if we have just removed the last
 	# installed version of PHP, then this will remove any dead symlinks
 	# belonging to eselect-php. Second, if a user upgrades slots from
 	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
 	# his existing symlinks to point to the new 7.0 installation. The
 	# latter is bug 432962.
 	#
 	# Note: the eselect-php package may not be installed at this point,
 	# so we can't die() if this command fails.
 	eselect php cleanup
 }
--- a/dev-lang/php/php-7.0.32.ebuild
+++ b/dev-lang/php/php-7.0.32.ebuild
@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
-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"
+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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
--- a/dev-lang/php/php-7.1.18.ebuild
+++ b/dev-lang/php/php-7.1.18.ebuild
@ -1,731 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit flag-o-matic eapi7-ver systemd
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
 SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3.01
 	BSD
 	Zend-2.0
 	bcmath? ( LGPL-2.1+ )
 	fpm? ( BSD-2 )
 	gd? ( gd )
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
 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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"
 IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
 	coverage crypt +ctype curl debug
 	enchant exif +fileinfo +filter firebird
 	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
 	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
 	mhash mssql mysql mysqli nls
 	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
 	readline recode selinux +session session-mm sharedmem
 	+simplexml snmp soap sockets spell sqlite ssl
 	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
 	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 # The supported (that is, autodetected) versions of BDB are listed in
 # the ./configure script. Other versions *work*, but we need to stick to
 # the ones that can be detected to avoid a repeat of bug #564824.
 COMMON_DEPEND="
 	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
 	fpm? ( acl? ( sys-apps/acl ) )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
 	berkdb? ( || (	sys-libs/db:5.3
 					sys-libs/db:5.1
 					sys-libs/db:4.8
 					sys-libs/db:4.7
 					sys-libs/db:4.6
 					sys-libs/db:4.5 ) )
 	bzip2? ( app-arch/bzip2:0= )
 	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
 	coverage? ( dev-util/lcov )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	enchant? ( app-text/enchant )
 	firebird? ( dev-db/firebird )
 	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
 	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
 	gmp? ( dev-libs/gmp:0= )
 	iconv? ( virtual/libiconv )
 	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
 	intl? ( dev-libs/icu:= )
 	iodbc? ( dev-db/libiodbc )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
 	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 	mssql? ( dev-db/freetds[mssql] )
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
 	postgres? ( dev-db/postgresql:* )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline:0= )
 	recode? ( app-text/recode )
 	session-mm? ( dev-libs/mm )
 	simplexml? ( >=dev-libs/libxml2-2.6.8 )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
 	soap? ( >=dev-libs/libxml2-2.6.8 )
 	spell? ( >=app-text/aspell-0.50 )
 	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
 	truetype? ( =media-libs/freetype-2* )
 	unicode? ( dev-libs/oniguruma:= )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	webp? ( media-libs/libwebp:0= )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
 	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
 	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
 	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? ( x11-libs/libXpm )
 	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
 	zip? ( sys-libs/zlib:0= )
 	zlib? ( sys-libs/zlib:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/mta
 	fpm? (
 		selinux? ( sec-policy/selinux-phpfpm )
 		systemd? ( sys-apps/systemd ) )"
 # Bison isn't actually needed when building from a release tarball
 # However, the configure script will warn if it's absent or if you
 # have an incompatible version installed. See bug 593278.
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	>=sys-devel/bison-3.0.1"
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
 	|| ( cli cgi fpm apache2 embed phpdbg )
 	cli? ( ^^ ( readline libedit ) )
 	truetype? ( gd zlib )
 	webp? ( gd zlib )
 	cjk? ( gd zlib )
 	exif? ( gd zlib )
 	xpm? ( gd zlib )
 	gd? ( zlib )
 	simplexml? ( xml )
 	soap? ( xml )
 	wddx? ( xml )
 	xmlrpc? ( || ( xml iconv ) )
 	xmlreader? ( xml )
 	xslt? ( xml )
 	ldap-sasl? ( ldap )
 	mhash? ( hash )
 	phar? ( hash )
 	qdbm? ( !gdbm )
 	readline? ( !libedit )
 	recode? ( !imap !mysqli !mysql )
 	session-mm? ( session !threads )
 	mysql? ( || ( mysqli pdo ) )
 "
 PATCHES=(
 	# hopefully upstream will include the same version check fixes in upcoming releases
 	# patch added 20180429
 	"${FILESDIR}/libressl-compatibility.patch"
 	"${FILESDIR}/php-freetype-2.9.1.patch"
 )
 PHP_MV="$(ver_cut 1)"
 php_install_ini() {
 	local phpsapi="${1}"
 	# work out where we are installing the ini file
 	php_set_ini_dir "${phpsapi}"
 	# Always install the production INI file, bug 611214.
 	local phpinisrc="php.ini-production-${phpsapi}"
 	cp php.ini-production "${phpinisrc}" || die
 	# default to /tmp for save_path, bug #282768
 	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
 	# Set the extension dir
 	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
 		-i "${phpinisrc}" || die
 	# Set the include path to point to where we want to find PEAR packages
 	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
 	dodir "${PHP_INI_DIR#${EPREFIX}}"
 	insinto "${PHP_INI_DIR#${EPREFIX}}"
 	newins "${phpinisrc}" php.ini
 	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
 	elog
 	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
 	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
 	if use opcache; then
 		elog "Adding opcache to $PHP_EXT_INI_DIR"
 		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
 			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
 		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
 			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
 	fi
 	# SAPI-specific handling
 	if [[ "${sapi}" == "fpm" ]] ; then
 		einfo "Installing FPM config files php-fpm.conf and www.conf"
 		insinto "${PHP_INI_DIR#${EPREFIX}}"
 		doins sapi/fpm/php-fpm.conf
 		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
 		doins sapi/fpm/www.conf
 	fi
 	dodoc php.ini-{development,production}
 }
 php_set_ini_dir() {
 	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 src_prepare() {
 	default
 	# In php-7.x, the FPM pool configuration files have been split off
 	# of the main config. By default the pool config files go in
 	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
 	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
 	# we'll install the pool configuration file "www.conf" there.
 	php_set_ini_dir fpm
 	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
 		sapi/fpm/php-fpm.conf.in \
 		|| die 'failed to move the include directory in php-fpm.conf'
 }
 src_configure() {
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
 	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
 	local our_conf=(
 		--prefix="${PHP_DESTDIR}"
 		--mandir="${PHP_DESTDIR}/man"
 		--infodir="${PHP_DESTDIR}/info"
 		--libdir="${PHP_DESTDIR}/lib"
 		--with-libdir="$(get_libdir)"
 		--localstatedir="${EPREFIX}/var"
 		--without-pear
 		$(use_enable threads maintainer-zts)
 	)
 	our_conf+=(
 		$(use_enable bcmath bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar calendar)
 		$(use_enable coverage gcov)
 		$(use_enable ctype ctype)
 		$(use_with curl curl "${EPREFIX}/usr")
 		$(use_enable xml dom)
 		$(use_with enchant enchant "${EPREFIX}/usr")
 		$(use_enable exif exif)
 		$(use_enable fileinfo fileinfo)
 		$(use_enable filter filter)
 		$(use_enable ftp ftp)
 		$(use_with nls gettext "${EPREFIX}/usr")
 		$(use_with gmp gmp "${EPREFIX}/usr")
 		$(use_enable hash hash)
 		$(use_with mhash mhash "${EPREFIX}/usr")
 		$(use_with iconv iconv \
 			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
 		$(use_enable intl intl)
 		$(use_enable ipv6 ipv6)
 		$(use_enable json json)
 		$(use_with kerberos kerberos "${EPREFIX}/usr")
 		$(use_enable xml libxml)
 		$(use_with xml libxml-dir "${EPREFIX}/usr")
 		$(use_enable unicode mbstring)
 		$(use_with crypt mcrypt "${EPREFIX}/usr")
 		$(use_with unicode onig "${EPREFIX}/usr")
 		$(use_with ssl openssl "${EPREFIX}/usr")
 		$(use_with ssl openssl-dir "${EPREFIX}/usr")
 		$(use_enable pcntl pcntl)
 		$(use_enable phar phar)
 		$(use_enable pdo pdo)
 		$(use_enable opcache opcache)
 		$(use_with postgres pgsql "${EPREFIX}/usr")
 		$(use_enable posix posix)
 		$(use_with spell pspell "${EPREFIX}/usr")
 		$(use_with recode recode "${EPREFIX}/usr")
 		$(use_enable simplexml simplexml)
 		$(use_enable sharedmem shmop)
 		$(use_with snmp snmp "${EPREFIX}/usr")
 		$(use_enable soap soap)
 		$(use_enable sockets sockets)
 		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
 		$(use_enable sysvipc sysvmsg)
 		$(use_enable sysvipc sysvsem)
 		$(use_enable sysvipc sysvshm)
 		$(use_with tidy tidy "${EPREFIX}/usr")
 		$(use_enable tokenizer tokenizer)
 		$(use_enable wddx wddx)
 		$(use_enable xml xml)
 		$(use_enable xmlreader xmlreader)
 		$(use_enable xmlwriter xmlwriter)
 		$(use_with xmlrpc xmlrpc)
 		$(use_with xslt xsl "${EPREFIX}/usr")
 		$(use_enable zip zip)
 		$(use_with zlib zlib "${EPREFIX}/usr")
 		$(use_enable debug debug)
 	)
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
 		|| use qdbm ; then
 		our_conf+=( "--enable-dba${shared}" )
 	fi
 	# DBA drivers support
 	our_conf+=(
 		$(use_with cdb cdb)
 		$(use_with berkdb db4 "${EPREFIX}/usr")
 		$(use_enable flatfile flatfile)
 		$(use_with gdbm gdbm "${EPREFIX}/usr")
 		$(use_enable inifile inifile)
 		$(use_with qdbm qdbm "${EPREFIX}/usr")
 	)
 	# Support for the GD graphics library
 	our_conf+=(
 		$(use_with truetype freetype-dir "${EPREFIX}/usr")
 		$(use_enable cjk gd-jis-conv)
 		$(use_with gd jpeg-dir "${EPREFIX}/usr")
 		$(use_with gd png-dir "${EPREFIX}/usr")
 		$(use_with xpm xpm-dir "${EPREFIX}/usr")
 	)
 	if use webp; then
 		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
 	fi
 	# enable gd last, so configure can pick up the previous settings
 	our_conf+=( $(use_with gd gd) )
 	# IMAP support
 	if use imap ; then
 		our_conf+=(
 			$(use_with imap imap "${EPREFIX}/usr")
 			$(use_with ssl imap-ssl "${EPREFIX}/usr")
 		)
 	fi
 	# Interbase/firebird support
 	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
 	# LDAP support
 	if use ldap ; then
 		our_conf+=(
 			$(use_with ldap ldap "${EPREFIX}/usr")
 			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
 		)
 	fi
 	# MySQL support
 	local mysqllib="mysqlnd"
 	local mysqlilib="mysqlnd"
 	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
 	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
 	if use mysql || use mysqli ; then
 		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
 	fi
 	# ODBC support
 	our_conf+=(
 		$(use_with odbc unixODBC "${EPREFIX}/usr")
 		$(use_with iodbc iodbc "${EPREFIX}/usr")
 	)
 	# Oracle support
 	our_conf+=( $(use_with oci8-instant-client oci8) )
 	# PDO support
 	if use pdo ; then
 		our_conf+=(
 			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
 			$(use_with mysql pdo-mysql "${mysqllib}")
 			$(use_with postgres pdo-pgsql)
 			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
 			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
 			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
 			$(use_with oci8-instant-client pdo-oci)
 		)
 	fi
 	# readline/libedit support
 	our_conf+=(
 		$(use_with readline readline "${EPREFIX}/usr")
 		$(use_with libedit libedit "${EPREFIX}/usr")
 	)
 	# Session support
 	if use session ; then
 		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
 	else
 		our_conf+=( $(use_enable session session) )
 	fi
 	# Use pic for shared modules such as apache2's mod_php
 	our_conf+=( --with-pic )
 	# we use the system copy of pcre
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
 	our_conf+=(
 		--with-pcre-regex="${EPREFIX}/usr"
 		--with-pcre-dir="${EPREFIX}/usr"
 	)
 	# Catch CFLAGS problems
 	# Fixes bug #14067.
 	# Changed order to run it in reverse for bug #32022 and #12021.
 	replace-cpu-flags "k6*" "i586"
 	# Cache the ./configure test results between SAPIs.
 	our_conf+=( --cache-file="${T}/config.cache" )
 	# Support user-passed configuration parameters
 	our_conf+=( ${EXTRA_ECONF:-} )
 	# Support the Apache2 extras, they must be set globally for all
 	# SAPIs to work correctly, especially for external PHP extensions
 	mkdir -p "${WORKDIR}/sapis-build" || die
 	for one_sapi in $SAPIS ; do
 		use "${one_sapi}" || continue
 		php_set_ini_dir "${one_sapi}"
 		# The BUILD_DIR variable is used to determine where to output
 		# the files that autotools creates. This was all originally
 		# based on the autotools-utils eclass.
 		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
 		cp -a "${S}" "${BUILD_DIR}" || die
 		cd "${BUILD_DIR}" || die
 		local sapi_conf=(
 			--with-config-file-path="${PHP_INI_DIR}"
 			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
 		)
 		for sapi in $SAPIS ; do
 			case "$sapi" in
 				cli|cgi|embed|fpm|phpdbg)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( "--enable-${sapi}" )
 						if [[ "fpm" == "${sapi}" ]] ; then
 							sapi_conf+=(
 								$(use_with acl fpm-acl)
 								$(use_with systemd fpm-systemd)
 							)
 						fi
 					else
 						sapi_conf+=( "--disable-${sapi}" )
 					fi
 					;;
 				apache2)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
 						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
 					else
 						sapi_conf+=( --without-apxs2 )
 					fi
 					;;
 			esac
 		done
 		# Construct the $myeconfargs array by concatenating $our_conf
 		# (the common args) and $sapi_conf (the SAPI-specific args).
 		local myeconfargs=( "${our_conf[@]}" )
 		myeconfargs+=( "${sapi_conf[@]}" )
 		pushd "${BUILD_DIR}" > /dev/null || die
 		econf "${myeconfargs[@]}"
 		popd > /dev/null || die
 	done
 }
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
 			cd "${WORKDIR}/sapis-build/$sapi" || \
 				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
 			emake
 		fi
 	done
 }
 src_install() {
 	# see bug #324739 for what happens when we don't have that
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
 	for sapi in $SAPIS ; do
 		if use $sapi ; then
 			first_sapi=$sapi
 			break
 		fi
 	done
 	# Makefile forgets to create this before trying to write to it...
 	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
 	# Install php environment (without any sapis)
 	cd "${WORKDIR}/sapis-build/$first_sapi" || die
 	emake INSTALL_ROOT="${D}" \
 		install-build install-headers install-programs
 	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
 	# Create the directory where we'll put version-specific php scripts
 	keepdir "/usr/share/php${PHP_MV}"
 	local sapi="", file=""
 	local sapi_list=""
 	for sapi in ${SAPIS}; do
 		if use "${sapi}" ; then
 			einfo "Installing SAPI: ${sapi}"
 			cd "${WORKDIR}/sapis-build/${sapi}" || die
 			if [[ "${sapi}" == "apache2" ]] ; then
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
 				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
 				newins ".libs/libphp${PHP_MV}$(get_libname)" \
 					   "libphp${PHP_MV}$(get_libname)"
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
 				# needed each time, php_install_ini would reset it
 				local dest="${PHP_DESTDIR#${EPREFIX}}"
 				into "${dest}"
 				case "$sapi" in
 					cli)
 						source="sapi/cli/php"
 						;;
 					cgi)
 						source="sapi/cgi/php-cgi"
 						;;
 					fpm)
 						source="sapi/fpm/php-fpm"
 						;;
 					embed)
 						source="libs/libphp${PHP_MV}$(get_libname)"
 						;;
 					phpdbg)
 						source="sapi/phpdbg/phpdbg"
 						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
 				esac
 				if [[ "${source}" == *"$(get_libname)" ]]; then
 					dolib.so "${source}"
 				else
 					dobin "${source}"
 					local name="$(basename ${source})"
 					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
 				fi
 			fi
 			php_install_ini "${sapi}"
 			# construct correct SAPI string for php-config
 			# thanks to ferringb for the bash voodoo
 			if [[ "${sapi}" == "apache2" ]]; then
 				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
 			else
 				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
 			fi
 		fi
 	done
 	# Installing opcache module
 	if use opcache ; then
 		into "${PHP_DESTDIR#${EPREFIX}}"
 		dolib.so "modules/opcache$(get_libname)"
 	fi
 	# Install env.d files
 	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
 	# set php-config variable correctly (bug #278439)
 	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
 		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
 	if use fpm ; then
 		if use systemd; then
 			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
 							"php-fpm@${SLOT}.service"
 		else
 			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
 							"php-fpm@${SLOT}.service"
 		fi
 	fi
 }
 src_test() {
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
 	if [[ ! -x "${PHP_BIN}" ]] ; then
 		ewarn "Test phase requires USE=cli, skipping"
 		return
 	else
 		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi
 	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
 		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
 	fi
 	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
 		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
 	fi
 	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
 					  "session.save_path=${T}" \
 					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
 					  "session.save_path=${T}"
 	for name in ${EXPECTED_TEST_FAILURES}; do
 		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
 	done
 	local failed="$(find -name '*.out')"
 	if [[ ${failed} != "" ]] ; then
 		ewarn "The following test cases failed unexpectedly:"
 		for name in ${failed}; do
 			ewarn "  ${name/.out/}"
 		done
 	else
 		einfo "No unexpected test failures, all fine"
 	fi
 	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
 		local passed=""
 		for name in ${EXPECTED_TEST_FAILURES}; do
 			[[ -f "${name}.diff" ]] && continue
 			passed="${passed} ${name}"
 		done
 		if [[ ${passed} != "" ]] ; then
 			einfo "The following test cases passed unexpectedly:"
 			for name in ${passed}; do
 				ewarn "  ${passed}"
 			done
 		else
 			einfo "None of the known-to-fail tests passed, all fine"
 		fi
 	fi
 }
 pkg_postinst() {
 	# Output some general info to the user
 	if use apache2 ; then
 		elog
 		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
 		elog "your apache2 command. OpenRC users can append that string to"
 		elog "APACHE2_OPTS in /etc/conf.d/apache2."
 		elog
 		elog "The apache module configuration file 70_mod_php.conf is"
 		elog "provided (and maintained) by eselect-php."
 		elog
 	fi
 	# Create the symlinks for php
 	for m in ${SAPIS}; do
 		[[ ${m} == 'embed' ]] && continue;
 		if use $m ; then
 			local ci=$(eselect php show $m)
 			if [[ -z $ci ]]; then
 				eselect php set $m php${SLOT} || die
 				einfo "Switched ${m} to use php:${SLOT}"
 				einfo
 			elif [[ $ci != "php${SLOT}" ]] ; then
 				elog "To switch $m to use php:${SLOT}, run"
 				elog "    eselect php set $m php${SLOT}"
 				elog
 			fi
 		fi
 	done
 	# Remove dead symlinks for SAPIs that were just disabled. For
 	# example, if the user has the cgi SAPI enabled, then he has an
 	# eselect-php symlink for it. If he later reinstalls PHP with
 	# USE="-cgi", that symlink will break. This call to eselect is
 	# supposed to remove that dead link per bug 572436.
 	eselect php cleanup || die
 	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
 	   elog "To build extensions for this version of PHP, you will need to"
 	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
 	   elog
 	fi
 	# Warn about the removal of PHP_INI_VERSION if the user has it set.
 	if [[ -n "${PHP_INI_VERSION}" ]]; then
 		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
 		ewarn 'remove it from your configuration at your convenience. See'
 		ewarn
 		ewarn '  https://bugs.gentoo.org/611214'
 		ewarn
 		ewarn 'for more information.'
 	fi
 	elog "For details on how version slotting works, please see"
 	elog "the wiki:"
 	elog
 	elog "  https://wiki.gentoo.org/wiki/PHP"
 	elog
 }
 pkg_postrm() {
 	# This serves two purposes. First, if we have just removed the last
 	# installed version of PHP, then this will remove any dead symlinks
 	# belonging to eselect-php. Second, if a user upgrades slots from
 	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
 	# his existing symlinks to point to the new 7.0 installation. The
 	# latter is bug 432962.
 	#
 	# Note: the eselect-php package may not be installed at this point,
 	# so we can't die() if this command fails.
 	eselect php cleanup
 }
--- a/dev-lang/php/php-7.1.22.ebuild
+++ b/dev-lang/php/php-7.1.22.ebuild
@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
-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"
+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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
--- a/dev-lang/php/php-7.2.10.ebuild
+++ b/dev-lang/php/php-7.2.10.ebuild
@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(ver_cut 1-2)"
-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"
+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"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
--- a/dev-lang/tcl/tcl-8.6.8.ebuild
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.8.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RDEPEND="
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@ -1,3 +1 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
 DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
 DIST flatbuffers-1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
--- a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils flag-o-matic
 DESCRIPTION="Memory efficient serialization library"
 HOMEPAGE="https://google.github.io/flatbuffers/"
 SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs test"
 src_configure() {
 	append-cppflags -std=c++11
 	local mycmakeargs=(
 		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
 		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
 		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	dobin "${CMAKE_BUILD_DIR}"/flatc
 }
--- a/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils flag-o-matic
 DESCRIPTION="Memory efficient serialization library"
 HOMEPAGE="https://google.github.io/flatbuffers/"
 SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs test"
 src_configure() {
 	append-cppflags -std=c++11
 	local mycmakeargs=(
 		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
 		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
 		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	dobin "${CMAKE_BUILD_DIR}"/flatc
 }
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@ -1,2 +1 @@
 DIST kdiagram-2.6.0.tar.xz 683792 BLAKE2B bc6074e4732a2eda4d8b2a321cfc8a2bad0f614c8d6dd48347f3e2f9ec013b2915a9793807b8640ee00cb1e20229741aae1e77abfd9f826016899a4178581f44 SHA512 243839e23171f5deafb167e5a05f1a2841f0294c9f7944cd2580c9e72830a7082a84e4dddd70da620751bcad4086325747e2308872dc272404540b13d91e4ca3
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
--- a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
@ -1,30 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 KDE_EXAMPLES="true"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
 HOMEPAGE="https://www.kde.org/"
 IUSE=""
 REQUIRED_USE="test? ( examples )"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 fi
 RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep linguist-tools)
 "
--- a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
@ -16,7 +16,7 @@ IUSE=""
 REQUIRED_USE="test? ( examples )"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@ -1,4 +1,6 @@
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
 DIST leatherman-1.4.3.tar.gz 814259 BLAKE2B 049cfab8240e5447bcb14bb4a96fa21ca7e4b7a24d8a38abf3820d6e1c25cf1e0841b04317c3d3a72ceb5f61f9b9a055ea76dcd5f731ffd567d96be60d2b8abd SHA512 a28d7f852904eafb3b703d5890d9514db24ef387fa440108ae8750041d1c5c1b36240b0925b37833ed68739d92a1d22463914e0838e5f09e03035aad47c49d81
 DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
 DIST leatherman-1.5.1.tar.gz 814327 BLAKE2B 133c65adb16b9eabd8dab341361d36a3736447596b019f15603e7cb45bef472a4267c5765adcb03bf9492d7f553d326c0f64ca026b4cad22e6f4744f9f12cc6e SHA512 3673a6ed530ae8f30b9a037ad42a3648ad61d50eae5c3a39a4a58f190567ccd21c4132289ecc8534202502bb7435ae79c9568a3dadf0ce75ae9c7d7fb65271f9
 DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
--- a/dev-libs/leatherman/leatherman-1.4.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.4.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils multilib
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
 SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.54:=[nls]
 	net-misc/curl
 	>=sys-devel/gcc-4.8:*"
 PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
 	cmake-utils_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=ON
 		)
 	else
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=OFF
 		)
 	fi
 	if use debug; then
 		mycmakeargs+=(
 		  -DCMAKE_BUILD_TYPE=Debug
 		)
 	fi
 	cmake-utils_src_configure
 }
 src_test() {
 	"${WORKDIR}/${P}"_build/bin/leatherman_test
 }
 src_install() {
 	cmake-utils_src_install
 }
--- a/dev-libs/leatherman/leatherman-1.5.2.ebuild
+++ b/dev-libs/leatherman/leatherman-1.5.2.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils multilib
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
 SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.54:=[nls]
 	net-misc/curl
 	>=sys-devel/gcc-4.8:*"
 PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
 	cmake-utils_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=ON
 		)
 	else
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=OFF
 		)
 	fi
 	if use debug; then
 		mycmakeargs+=(
 		  -DCMAKE_BUILD_TYPE=Debug
 		)
 	fi
 	cmake-utils_src_configure
 }
 src_test() {
 	"${WORKDIR}/${P}"_build/bin/leatherman_test
 }
 src_install() {
 	cmake-utils_src_install
 }
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 multilib_src_configure() {
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@ -4,3 +4,4 @@ DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443b
 DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117ca0c53f8d3e7c9dd7e57f4959dca6e46db095cca93f3a079850268e5cc0fc68b2916a20773f09b2ba5f1531cc0 SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
 DIST libuv-1.23.0.tar.gz 1189014 BLAKE2B 1bb2330773b8e7e7ee00e7000ea4076e0d93c3f54f7dc4e8ae0c6c73c652a406c907ee16a2364fc8688c7cc7a367fd3dab7a8b4885caf06a0196cb3d09fe7fb3 SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
 DIST libuv-1.23.1.tar.gz 1190885 BLAKE2B 6a14ad9972f9f7e78627c2f1d0891c058189a26822fb99432f704ef959ad5d98a4f8308255e924ca87d14c6f64e38ed3ecf9d9203f5a51e70f555e12b32c33d7 SHA512 5c3170dea49d7954f5780bc94d5c021a8e1bf91e2d17188335825f1dc1098a8826d5eb9dac4be318ec68275888d0dfa9579a841d43de0c3520c89ab0dc70e5ab
 DIST libuv-1.23.2.tar.gz 1192529 BLAKE2B 045e7d46b9b45fb415be1827692021ae85a86b5a5b2fc5677de5d160e3b39c40a3379223fedd1ae7265707003f62e130b0c101b4fd367b9f44cd0daaa7d35dd5 SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
--- a/dev-libs/libuv/libuv-1.23.2.ebuild
+++ b/dev-libs/libuv/libuv-1.23.2.ebuild
@ -0,0 +1,47 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools multilib-minimal
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
 SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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"
 IUSE="static-libs"
 RESTRICT="test"
 DEPEND="sys-devel/libtool
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
 src_prepare() {
 	default
 	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
 		> m4/libuv-extra-automake-flags.m4 || die
 	# upstream fails to ship a configure script
 	eautoreconf
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		cc_cv_cflags__g=no
 		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_test() {
 	mkdir "${BUILD_DIR}"/test || die
 	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
 	default
 }
 multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-libs/openssl/openssl-1.1.1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
@ -59,7 +59,7 @@ src_prepare() {
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
 		Configurations/unix-Makefile.tmpl \
 		|| die
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@ -1,3 +1,4 @@
 DIST sdformat-5.2.0.tar.bz2 445542 BLAKE2B 89daf9e03613bd88aceb1a2034cf0f9efe7b28ffb7aef8add4fc484a6e78d7189b4b6183fca83db4bb8017a4901d2fb3df7dc43e995bf2da8bb0fcde9510c6c9 SHA512 65df9f0d351ab894af41cc2081dc8ab179336092ceba17979720bed4d58f77e9648863501d83f073ea8478197e7e0a7d7a9f8efd3a54d22ee28d74765cebcee7
 DIST sdformat-5.3.0.tar.bz2 447471 BLAKE2B 9b511782f5d2517778fc0c977d1deab00ee7789f50628546b5ca8c1f464cc3ca132b83e1054867ec1d6678bca664232e1d9a499ff095d4f9a623f5061fc340c1 SHA512 63106bc438decb00157eca5fd3f7f783197a1f17a76008bee5d18d5c146f199e67852ef74cbbc53918760a0cdf382628ea84d2b4618512738cd574de1fc719d8
 DIST sdformat-6.0.0.tar.bz2 473765 BLAKE2B af3ed14323c2bed8ee5a22580dcb6d73a5e5c772f39ad7f806bf2cdb88d6f2c885585f36a666f2ec711dbd7ad6051ba69d79d2a9f0af7ad3b3681543b9feafe7 SHA512 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21
 DIST sdformat-6.1.0.tar.bz2 465231 BLAKE2B 5b12c4974662245ecb01e342632e274b58512dd2c223dfbf8e1ef9bb2ba267f16bc130b62367b09a9cac9e2ccbd2829439d055f2fa062f34df9f4a6ceb1a571e SHA512 6c5a03e877cba3b734f1cb132582274249bd0cb3a8d463be9077519d8ad126bb15650947b5455b3cdd1abea727918b21369b40a12de4fc5d6806880fd8686b97
--- a/dev-libs/sdformat/sdformat-6.1.0.ebuild
+++ b/dev-libs/sdformat/sdformat-6.1.0.ebuild
@ -0,0 +1,38 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit cmake-utils
 DESCRIPTION="Simulation Description Format (SDF) parser"
 HOMEPAGE="http://sdformat.org/"
 SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 # subslot = libsdformat major
 SLOT="0/6"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND="
 	>=dev-libs/urdfdom-1:=
 	dev-libs/tinyxml
 	dev-libs/boost:=
 	sci-libs/ignition-math:4=
 "
 DEPEND="${RDEPEND}
 	dev-lang/ruby:*
 	virtual/pkgconfig
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
 src_configure() {
 	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
 	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
 	local mycmakeargs=(
 		"-DUSE_INTERNAL_URDF=OFF"
 		"-DUSE_EXTERNAL_TINYXML=ON"
 	)
 	cmake-utils_src_configure
 }
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@ -1 +1 @@
-DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f
+DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
--- a/dev-libs/sink/sink-0.7.0.ebuild
+++ b/dev-libs/sink/sink-0.7.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -17,6 +17,7 @@ IUSE=""
 # uses it as a public dependency but doesn't search for it properly
 RDEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtgui)
@ -24,6 +25,7 @@ RDEPEND="
 	dev-db/lmdb:=
 	dev-libs/flatbuffers
 	dev-libs/kasync
 	>=dev-libs/xapian-1.4.4:0=
 	net-libs/kdav2
 	net-libs/kimap2
 	net-misc/curl
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test minimal"
 RDEPEND="
--- a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
+++ b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime enable taint checking"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 SRC_TEST=do
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Add test failures if warnings are caught"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 LICENSE="Apache-2.0"
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test minimal examples"
 RDEPEND="
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encoding and decoding of UTF-8 encoding form"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 RDEPEND="
--- a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Associate user-defined magic to variables from Perl"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="test"
 RDEPEND="
--- a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A XPath Perl Module"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RDEPEND=">=dev-perl/XML-Parser-2.230.0"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/daemonize/daemonize-2.4.7.ebuild
+++ b/dev-python/daemonize/daemonize-2.4.7.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@ -1,8 +1,4 @@
 DIST elasticsearch-5.5.1.tar.gz 33476827 BLAKE2B 4f37f13fcd0a236c5da5b74c4eec5ac9ce40234059643bed69b56e93a9d5b9758ebaf0f6d50155b7338c0c203cdd7296816d6c7bc5cb0ee5455e406e586c4bf8 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd
 DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
 DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
 DIST elasticsearch-curator-5.1.2.tar.gz 290616 BLAKE2B 57c02ddaf188b8dd08286e47d4eaf4e0af05d65d89139f77f5d71274c394defe491393a7043bb426fa4b260c199e92221c1e57b6d24922898e5e3b8e9e2de58b SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d
 DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
 DIST elasticsearch-curator-5.5.1.tar.gz 301351 BLAKE2B 1dfcf53995c203a7201e421bc9f01a840597d8c1099ae434be52ff27e47e30f509bf1c5a42d507b549f5fe8ce45cbe74614ea76c338b0ae9de1d51877c8b32fe SHA512 a0ccb35fe93cefb927020add9629d5879cb64ee41a25130150ee8c45867e210f611a5fca0a43357c6f68cbf0c3f0acf677a7f8d2b3b493f4c2815637640ed9f6
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
-DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
+DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
@ -1,120 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 MY_PN="curator"
 ES_VERSION="5.5.1"
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
 RESTRICT="test"
 # running tests in non-chroot environments:
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
 inherit distutils-r1
 DESCRIPTION="Tending time-series indices in Elasticsearch"
 HOMEPAGE="https://github.com/elasticsearch/curator"
 SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
 RDEPEND="
 	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
 	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.7[${PYTHON_USEDEP}]
 	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		virtual/jre:1.8
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}] )"
 S="${WORKDIR}/${MY_PN}-${PV}"
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
 	ES_PORT="25123"
 	ES_INSTANCE="gentoo-es-curator-test"
 	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
 	PID="${ES}/elasticsearch.pid"
 	# run Elasticsearch instance on custom port
 	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
 		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
 		"${ES}/config/elasticsearch.yml" || die
 	# start local instance of elasticsearch
 	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
 	local i
 	local es_started=0
 	for i in {1..20}; do
 		grep -q "started" "${ES_LOG}" 2> /dev/null
 		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
 			es_started=1
 			eend 0
 			break
 		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
 			eend 1
 			eerror "Elasticsearch already running"
 			die "Cannot start Elasticsearch for tests"
 		else
 			einfo "Waiting for Elasticsearch"
 			eend 1
 			sleep 2
 			continue
 		fi
 	done
 	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
 	esetup.py test || die
 	pkill -F ${PID}
 }
 python_prepare_all() {
 	# avoid downloading from net
 	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	cd docs || die
 	emake man $(usex doc html "")
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	doman docs/_build/man/*
 	distutils-r1_python_install_all
 }
 pkg_postinst() {
 	ewarn ""
 	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
 	ewarn ""
 	ewarn "Example usage on Python 3:"
 	ewarn "export LC_ALL=en_US.UTF-8"
 	ewarn "export LANG=en_US.UTF-8"
 	ewarn "curator ..."
 }
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
@ -1,121 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 MY_PN="curator"
 ES_VERSION="6.2.4"
 inherit distutils-r1
 DESCRIPTION="Tending time-series indices in Elasticsearch"
 HOMEPAGE="https://github.com/elasticsearch/curator"
 SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 IUSE="doc test"
 RDEPEND="
 	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
 	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.7[${PYTHON_USEDEP}]
 	>=dev-python/certifi-2018.01.18[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		virtual/jre:1.8
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}] )"
 S="${WORKDIR}/${MY_PN}-${PV}"
 python_prepare_all() {
 	# avoid downloading from net
 	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
 	# allow to use newer dev-python/elasticsearch-py
 	sed -e 's/elasticsearch==5.5.2/elasticsearch>=5.4.0/g' -i setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	emake -C docs -j1 man $(usex doc html "")
 }
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
 #
 # running tests in non-chroot environments:
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
 	ES_PORT="25123"
 	ES_INSTANCE="gentoo-es-curator-test"
 	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
 	PID="${ES}/elasticsearch.pid"
 	# run Elasticsearch instance on custom port
 	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
 		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
 		"${ES}/config/elasticsearch.yml" || die
 	# start local instance of elasticsearch
 	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
 	local i
 	local es_started=0
 	for i in {1..20}; do
 		grep -q "started" "${ES_LOG}" 2> /dev/null
 		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
 			es_started=1
 			eend 0
 			break
 		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
 			eend 1
 			eerror "Elasticsearch already running"
 			die "Cannot start Elasticsearch for tests"
 		else
 			einfo "Waiting for Elasticsearch"
 			eend 1
 			sleep 2
 			continue
 		fi
 	done
 	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
 	esetup.py test || die
 	pkill -F ${PID}
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	doman docs/_build/man/*
 	distutils-r1_python_install_all
 }
 pkg_postinst() {
 	ewarn ""
 	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
 	ewarn ""
 	ewarn "Example usage on Python 3:"
 	ewarn "export LC_ALL=en_US.UTF-8"
 	ewarn "export LANG=en_US.UTF-8"
 	ewarn "curator ..."
 }
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 MY_PN="curator"
-ES_VERSION="6.3.1"
+ES_VERSION="6.3.2"
 inherit distutils-r1
@ -23,10 +23,16 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 IUSE="doc test"
 # require >=elasticsearch-py-6.1.0 because starting with version 5.5.2, the package
 # was renamed to elasticsearch5 so elasticsearch-curator cannot find it #667526
 #
 # require <click-7.0
 # https://github.com/elastic/curator/issues/1279
 RDEPEND="
-	>=dev-python/elasticsearch-py-5.5.2[${PYTHON_USEDEP}]
+	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
 	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.7[${PYTHON_USEDEP}]
 	<dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/certifi-2018.04.16[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
--- a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 MY_PN="Flask-WTF"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Simple integration of Flask and WTForms"
 HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/flask-testing[${PYTHON_USEDEP}]
 		dev-python/flask-uploads[${PYTHON_USEDEP}]
 		dev-python/speaklater[${PYTHON_USEDEP}]
 		dev-python/flask-babel[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
 	)"
 S="${WORKDIR}/${MY_P}"
 python_prepare_all() {
 	# tries to access things over the network
 	rm tests/test_recaptcha.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	nosetests || die "Tests failed under ${EPYTHON}"
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@ -1 +1,2 @@
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
--- a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
@ -0,0 +1,48 @@
 diff --git a/configure.ac b/configure.ac
 index 5cbf273..9e80b48 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -4,8 +4,7 @@ AC_SUBST(PYILMBASE_VERSION, 2.3.0)
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
 AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
 -AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
 -AM_MAINTAINER_MODE
 +AM_INIT_AUTOMAKE
 dnl static python modules make no sense - disable static
 AC_DISABLE_STATIC
@@ -20,7 +19,7 @@ dnl Checks for programs.
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 -AC_PROG_LIBTOOL
 +LT_INIT
 AC_PROG_MAKE_SET
 dnl
@@ -164,22 +163,13 @@ AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
 -AC_MSG_CHECKING(for gcc optimization flags)
 -old_cflags=$CFLAGS
 -CFLAGS="$CFLAGS -pipe"
 -AC_TRY_COMPILE([#include <stdio.h>],
 -[ printf ("hello, world"); ],
 -[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
 -CFLAGS=$old_cflags
 -AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
 -
 dnl Platform-specific stuff
 case "$host" in
 *linux*)
 -  AC_DEFINE(HAVE_LINUX_PROCFS)
 +  AC_DEFINE([HAVE_LINUX_PROCFS], [1], [define on linux])
   ;;
 *darwin*) 
 -  AC_DEFINE(HAVE_DARWIN) 
 +  AC_DEFINE([HAVE_DARWIN], [1], [define on OSX]) 
   ;;
 esac
--- a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
@ -0,0 +1,13 @@
 diff --git a/PyImath/Makefile.am b/PyImath/Makefile.am
 index bf87542..ad69515 100644
 --- a/PyImath/Makefile.am
 +++ b/PyImath/Makefile.am
@@ -82,7 +82,7 @@ imathmodule_la_SOURCES = imathmodule.cpp \
     PyImathBasicTypes.cpp 
 imathmodule_la_LDFLAGS = -avoid-version -module
 -imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
 +imathmodule_la_LIBADD  = libPyImath.la @BOOST_PYTHON_LIBS@
 noinst_HEADERS = PyImathFun.h \
     PyImathBasicTypes.h 
--- a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@ -0,0 +1,59 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit autotools python-single-r1
 DESCRIPTION="ilmbase Python bindings"
 HOMEPAGE="http://www.openexr.com"
 SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+numpy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEP}
 	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
 	~media-libs/ilmbase-${PV}:=
 	numpy? ( >=dev-python/numpy-1.10.4 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEP}
 	>=virtual/pkgconfig-0-r1"
 PATCHES=(
 	"${FILESDIR}/${P}-link-pyimath.patch"
 	"${FILESDIR}/${P}-fix-build-system.patch"
 )
 DOCS=( README.md )
 src_prepare() {
 	default
 	eautoreconf
 }
 src_configure() {
 	local myeconfargs=(
 		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
 		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
 		--with-boost-python-libname="boost_python-${EPYTHON:6}"
 		$(use_with numpy)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	# Fails to install with multiple jobs
 	emake DESTDIR="${D}" -j1 install
 	einstalldocs
 	# package provides pkg-config files
 	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-python/pytest/pytest-3.8.2.ebuild
+++ b/dev-python/pytest/pytest-3.8.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@ -1,2 +1,3 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
 DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.15.1.ebuild
@ -0,0 +1,24 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 inherit ros-catkin
 DESCRIPTION="Combined Robot HW class"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	>=dev-ros/hardware_interface-0.15
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
 	dev-ros/roscpp
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@ -1,2 +1,3 @@
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
 DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
 DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
--- a/Show More
+++ b/Show More
`@ -1,2 +1,2 @@`
	`DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2`	`DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2`
	`DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100`	`DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668`
`@ -1 +1,2 @@`
	`DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da`	`DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da`
		`DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726`
`@ -1,2 +1 @@`
	`DIST kdiagram-2.6.0.tar.xz 683792 BLAKE2B bc6074e4732a2eda4d8b2a321cfc8a2bad0f614c8d6dd48347f3e2f9ec013b2915a9793807b8640ee00cb1e20229741aae1e77abfd9f826016899a4178581f44 SHA512 243839e23171f5deafb167e5a05f1a2841f0294c9f7944cd2580c9e72830a7082a84e4dddd70da620751bcad4086325747e2308872dc272404540b13d91e4ca3`
	`DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128`	`DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128`
`@ -1 +1 @@`
	`DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f`	`DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0`
`@ -1 +1,2 @@`
	`DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344`	`DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344`
		`DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f`