Sync with portage [Wed Nov 20 08:33:35 MSK 2019].

4 years ago · 8ca8a337a9
parent 52ab13d6f1
commit 8ca8a337a9
7840 changed files with 11218 additions and 11069 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86"

 DEPEND="
 	app-arch/unzip
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@ -1,5 +1,6 @@
 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
 DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
+DIST consul-template-0.23.0.tar.gz 192356 BLAKE2B 204f0fc7ca6780a60d88ccbd75181897e9c4db5194cd702e2ac3759d456dcb9fcae4a9f8481ccbd2d61609fb9d1330f143a0c039b6278e15d85cc2535cf5b13e SHA512 769992578fb6b9f69e9c41280a46c27e74cabbd7cffddc158dc301ffaa9ad1e5b11e626e5bc2e18532952fecb61f83c107003929e9671d5de4c6f3a82b7120f6
 DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
 DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
@ -13,6 +14,7 @@ DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c
 DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
 DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
 DIST github.com-hashicorp-consul-v1.1.0.tar.gz 11125956 BLAKE2B 61a8c7463f6659368d990626ebefa20bc545f17e66fb0a06a178e8cf7cb83637e64cf7496ed93facab73ef2340d46b08d7f86533378a7e57530ce1a959a9f398 SHA512 80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721
+DIST github.com-hashicorp-consul-v1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
 DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
 DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
 DIST github.com-hashicorp-go-gatedio-v0.5.0.tar.gz 8250 BLAKE2B d5a51c4ed7c2d6b3689ec50118a0543b0b581b140667b67f4a842ca6299d392832c10c6512b145f4aa372d97de47b62c29565d01f231cb41b830e18542ea26df SHA512 378cecb6d3f0f13d892ee087ee8335fa7a75b9feb8af549e06d4c81372961840767ecf7d706f0602a7b47c692abad96016c158b5dc3973dac9667fa06114268d
--- a/app-admin/consul-template/consul-template-0.23.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.23.0.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/armon/go-metrics ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5"
+	"github.com/frankban/quicktest v1.4.0"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/google/btree v1.0.0"
+	"github.com/hashicorp/consul v1.2.0"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-gatedio v0.5.0"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-retryablehttp v0.6.2"
+	"github.com/hashicorp/go-rootcerts v1.0.1"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/logutils v1.0.0"
+	"github.com/hashicorp/memberlist v0.1.4"
+	"github.com/hashicorp/serf v0.8.3"
+	"github.com/hashicorp/vault 746c0b111519166ff2126f55dba7071912c33006"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pierrec/lz4 v2.2.5"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/crypto 4def268fd1a49955bfb3dda92fe3db4f924f2285 github.com/golang/crypto"
+	"golang.org/x/net ca1201d0de80cfde86cb01aea620983605dfe99b github.com/golang/net"
+	"golang.org/x/sys 1393eb0183657fb29200106b17a5042ec6e48dbe github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time c4c64cad1fd0a1a8dab2523e04e61d35308e131e github.com/golang/time"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/square/go-jose.v2 v2.3.1 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="521adf1"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+# TODO: debug test failures
+RESTRICT="test"
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+		-e '/-s \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
+	emake dev
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin "${GOBIN}/${PN}"
+	dodoc {CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -1,2 +1,3 @@
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
 DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac
+DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826
--- a/app-admin/consul/consul-1.6.2.ebuild
+++ b/app-admin/consul/consul-1.6.2.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="1200f25"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
--- a/app-admin/glance/glance-19.0.0.ebuild
+++ b/app-admin/glance/glance-19.0.0.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/train"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi

 LICENSE="Apache-2.0"
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/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">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">gopasspw/gopass</remote-id>
 	</upstream>
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@ -1 +1,2 @@
 DIST kubectx-0.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
+DIST kubectx-0.7.1.tar.gz 484162 BLAKE2B 54da3821da0fb992e1a12ad1e866f6f10c57a48da0414e8a48f293e090e289a0d26a70297974378b81f4e660ca13e85877c2f76b554eac526d1d830fdc439da1 SHA512 c78beba1820afb22548efb39e1fa704af017076096a4676d5a178bc3d65656f2352ee221d9754eb6fd8cc02a3aa96d743ce2c27a84a8b9c3684272cd2547fcf2
--- a/app-admin/kubectx/kubectx-0.7.1.ebuild
+++ b/app-admin/kubectx/kubectx-0.7.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-cluster/kubectl"
+
+src_install() {
+	dobin kubectx kubens
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="klogd">Build and install (deprecated) kernel logging daemon</flag>
+		<flag name="logger">Build the logger program</flag>
 		<flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
 	</use>
 </pkgmetadata>
--- a/app-admin/sysklogd/sysklogd-2.0.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.0.ebuild
@ -12,11 +12,11 @@ SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v$(ver_cut 1-2)
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="klogd logrotate systemd"
+IUSE="klogd logger logrotate systemd"
 RESTRICT="test"

-DEPEND=""
-RDEPEND=""
+DEPEND="!sys-apps/util-linux[logger]"
+RDEPEND="${DEPEND}"

 DOCS=( ChangeLog.md README.md )

@ -37,8 +37,8 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		# we have logger from sys-apps/util-linux
-		--without-logger
 		$(use_with klogd)
+		$(use_with logger)
 		$(use_with systemd systemd $(systemd_get_systemunitdir))
 	)
 	econf "${myeconfargs[@]}"
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -2,3 +2,5 @@ DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bd
 DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
 DIST vault-1.2.4-webui.tar.xz 1919024 BLAKE2B c1fc1460d70f33695ce9f7571a701035b02a376e4d336a9e368190a5ec08dc3ef417d2553a0e3ca5e745721eef49caeaaf294bd8b44550938ab02c7d63460744 SHA512 9b431083b1850e6e18b5212f04cc2d9305832c02594984caef298b2b33e176b6cc7f767e9e137208e005778d249410e482cfe4b6f6bfdb6f2ba54de9bcc4c7f6
 DIST vault-1.2.4.tar.gz 27778766 BLAKE2B 536dd114c0268f91eb6b5c13cc30d22cdb9d1085c1378c6e39a6fcffeb4d5313363d225c85073a4da124962d6f7de8e4800a6648e392909a9595341ac178d94a SHA512 35a91088ac6949863e2de651edac19d73586acc2f42d14e48d3b41236d9458c95e60f8ec2285b3846ff04ebe59a4d4b308686151d758b5af8caad711441e2ee4
+DIST vault-1.3.0-webui.tar.xz 2004176 BLAKE2B f17b51346e694e13cb51779f158116cd1e241ba1a90c5e384b40fafc916386fd12ae7e09e11b083f1ff8cb8aa89a94f811029edc10fceec2a08cbe8e65b1bac4 SHA512 2f3695134ffd9af478568b08fc66b593d00c0990178af2f3d0e8b27c53afeed1f7926d97afa688b21cca931665b435e85c036a9970f71355977815f214c66c0c
+DIST vault-1.3.0.tar.gz 31098388 BLAKE2B 81ac68f47eed4a9e0187774558d38701f4e1481b07bd8a6f310741741a112dcf8e8344e156b6cef2a05e115da998fafab9627d62e261ffb8995ebdd2468f770a SHA512 4011706c2d418e4e13369f5afa5541af8296d6731c12aa670ed0fce66cc4d950edb76a0d24722be6b63538dc3479dcf68bb89ce7d9f37437062635feb6432165
--- a/app-admin/vault/vault-1.3.0.ebuild
+++ b/app-admin/vault/vault-1.3.0.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i src/${EGO_PN}/Makefile || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	export GOBIN=${S}/bin GOPATH=${S}
+	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="openmp"

 DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@ -2,3 +2,4 @@ DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e57
 DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466
 DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
 DIST zstd-1.4.3.tar.gz 1911868 BLAKE2B da4c4b4f6afc36a23a13a9582874891ad206b01dc805f9e79879cb833b47c0bb18ec1b3bb5c0b99f4e8707d21659ca0b7446a84d15f513a3fcab206bc7f49539 SHA512 ccda90c7437635f92d0db39dfba3604e256f1f08284c35c042763a54b0ead45dca8e7fa3e5cf8032292d1dd9eefc1369e23f78a80d9335d69170563090677d5f
+DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
--- a/app-arch/zstd/zstd-1.4.4.ebuild
+++ b/app-arch/zstd/zstd-1.4.4.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	mymake -C lib libzstd libzstd.a libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/duplicity/metadata.xml
+++ b/app-backup/duplicity/metadata.xml
@ -5,6 +5,11 @@
 		<email>rich0@gentoo.org</email>
 		<name>Rich Freeman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<longdescription>Encrypted bandwidth-efficient backup using the rsync algorithm</longdescription>
 	<use>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
 	</use>
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/bvi/bvi-1.4.1.ebuild
+++ b/app-editors/bvi/bvi-1.4.1.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"

 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/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>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
  <upstream>
    <remote-id type="sourceforge">hte</remote-id>
    <bugs-to>https://github.com/sebastianbiallas/ht/issues</bugs-to>
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="mpg123-el"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"

 RDEPEND="media-sound/mpg123
 	media-sound/alsa-utils"
--- a/app-emacs/pymacs/pymacs-0.26.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 #IUSE="doc"

 #BDEPEND="doc? (
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@ -0,0 +1 @@
+DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15
--- a/app-emulation/crun/crun-0.10.6.ebuild
+++ b/app-emulation/crun/crun-0.10.6.ebuild
@ -0,0 +1,67 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bpf +caps doc seccomp systemd static-libs"
+
+DEPEND="
+	dev-libs/yajl
+	sys-libs/libseccomp
+	caps? ( sys-libs/libcap )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( dev-go/go-md2man )
+"
+
+DOCS=README.md
+
+src_configure() {
+	econf \
+		$(use_enable bpf) \
+		$(use_enable caps) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(usex static-libs '--enabled-shared  --enabled-static' '--enable-shared --disable-static' '' '')
+}
+
+src_compile() {
+	pushd libocispec || die
+	emake
+	popd || die
+	emake crun
+	if use doc ; then
+		emake crun.1
+	fi
+}
+
+src_install() {
+	pushd libocispec || die
+	emake "DESTDIR=${D}" install-exec
+	popd || die
+	emake "DESTDIR=${D}" install-exec
+	if use doc ; then
+		emake "DESTDIR=${D}" install-man
+	fi
+
+	# there is currently a bug in upstream autotooling that continues to build static libraries despite
+	# explicit configure options
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+
+	einstalldocs
+}
--- a/app-emulation/crun/metadata.xml
+++ b/app-emulation/crun/metadata.xml
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		While most of the tools used in the Linux containers ecosystem are written in
+		Go, crun authors believe C is a better fit for a lower level tool like a
+		container runtime. runc; the most used implementation of the OCI runtime specs
+		written in Go, re-execs itself and use a module written in C for setting up
+		the environment before the container process starts.
+
+		crun aims to be also usable as a library that can be easily included in
+		programs without requiring an external process for managing OCI containers.
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/containers/crun/releases</changelog>
+		<remote-id type="github">containers/crun</remote-id>
+	</upstream>
+	<use>
+		<flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter)
+			support for managing device controllers.
+		</flag>
+	</use>
+</pkgmetadata>
--- a/app-emulation/openstack-guest-agents-unix/Manifest
+++ b/app-emulation/openstack-guest-agents-unix/Manifest
@ -1,3 +0,0 @@
-DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 BLAKE2B 4245fb6fa2f8344469b264d1e9eee39e1914f76a33f54677d36ca854feb5a0548454af00cf02db9c5f2f0b6e68de9dc19fcf62a604b5d55fab96b20ed70a507e SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80
-DIST openstack-guest-agents-unix-1.39.1.tar.gz 75458 BLAKE2B 6afcf0cb40c7f24f7ea6ea8ca8af40373ce2fcbfffc5a8cae65e2ed8bf7003eb498b4592fa215e57a20e3c5d11064cfa4629b79eb94712ebb0ad5b09459fe815 SHA512 b1e88bb3492018375e7b2275829e2698d82d75c975a396ab7409c9b88f7787145b0da87c81a089aa8914fae30e996654b589bc1675bba769b661d7d1deb9590d
-DIST openstack-guest-agents-unix-1.39.1_p20170227.tar.gz 75309 BLAKE2B 3cd6f0bc3f5d7ae2ba4b1e8822e3c6659525dde4b7b9a9092bae4d825c965d88c5cba8f50f7e322cc08df1c4a113010645b2969eb1f4d3377db8279d58f56e8d SHA512 f36e40344a6a4debfa070d43177208edbeef7a829ace999b970e1423d7004d9255ab239c1feacdf9f3d14ddb469c67ccefe90a1bd83b1fb81c38a407c277832c
--- a/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
+++ b/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
@ -1,60 +0,0 @@
-From 84e1a32ee2b8d0607f2868365aa46aaea58f014c Mon Sep 17 00:00:00 2001
-From: Nate House <nathan.house@rackspace.com>
-Date: Mon, 20 Oct 2014 18:50:52 -0500
-Subject: [PATCH] Updated regexp to work with config headers added sometime ago
-
---
- tests/test_resetnetwork_interfaces.py | 26 +++++++++++---------------
- 1 file changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
-index dc8e7e7..b12b84c 100644
--- a/tests/test_resetnetwork_interfaces.py
-+++ b/tests/test_resetnetwork_interfaces.py
-@@ -344,17 +344,13 @@ def test_gentoo_legacy_ipv4(self):
- 
-         generated = outfiles['net'].rstrip()
-         # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-        pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-+        # (todo: naterh) Remove excessive unused kwargs
-+        pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
-                    '# Label public\n*' +
-                    'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
-                    'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
-                   'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)').format(
-                       ip=interface['ipv4'][0][0],
-                       netmask=interface['ipv4'][0][1],
-                       gateway=interface['gateway4'],
-                       dns=interface['dns'][0]
-                   )
-        expected_regex = re.compile(pattern, re.MULTILINE)
-+                   'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)')
-+        expected_regex = re.compile(pattern, re.DOTALL)
- 
-         self.assertRegexpMatches(generated, expected_regex)
- 
-@@ -373,17 +369,17 @@ def test_gentoo_legacy_ipv6(self):
- 
-         # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-         generated = outfiles['net'].rstrip()
-        pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-+        pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
-                    '# Label public\n*' +
-                    'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
-                    'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
-                    'dns_servers_eth0=\(\s*"{dns}"\s*\)').format(
-                       ip=interface['ipv6'][0][0],
-                       netmask_len=interface['ipv6'][0][1],
-                       gateway=interface['gateway6'],
-                       dns=interface['dns'][0]
-                   )
-        expected_regex = re.compile(pattern, re.MULTILINE)
-+            ip=interface['ipv6'][0][0],
-+            netmask_len=interface['ipv6'][0][1],
-+            gateway=interface['gateway6'],
-+            dns=interface['dns'][0]
-+        )
-+        expected_regex = re.compile(pattern, re.DOTALL)
- 
-         self.assertRegexpMatches(generated, expected_regex)
- 
--- a/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch
+++ b/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch
@ -1,57 +0,0 @@
-From 4453b4773688eef6c60736d9cf07100716308a5e Mon Sep 17 00:00:00 2001
-From: Nate House <nathan.house@rackspace.com>
-Date: Sun, 19 Oct 2014 15:49:35 -0500
-Subject: [PATCH] Updated tests to check for either ifconfig/iproute2
-
---
- tests/test_resetnetwork_interfaces.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
-index f2b73bf..dc8e7e7 100644
--- a/tests/test_resetnetwork_interfaces.py
-+++ b/tests/test_resetnetwork_interfaces.py
-@@ -343,8 +343,8 @@ def test_gentoo_legacy_ipv4(self):
-         self.assertTrue('net' in outfiles)
- 
-         generated = outfiles['net'].rstrip()
-
-        pattern = ('modules=\( "ifconfig" \)\n*' +
-+        # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-+        pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-                    '# Label public\n*' +
-                    'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
-                    'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
-@@ -371,8 +371,9 @@ def test_gentoo_legacy_ipv6(self):
- 
-         self.assertTrue('net' in outfiles)
- 
-+        # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-         generated = outfiles['net'].rstrip()
-        pattern = ('modules=\( "ifconfig" \)\n*' +
-+        pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-                    '# Label public\n*' +
-                    'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
-                    'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
-@@ -399,8 +400,9 @@ def test_gentoo_openrc_ipv4(self):
- 
-         self.assertTrue('net' in outfiles)
- 
-+        # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-         generated = outfiles['net'].rstrip()
-        pattern = ('modules="ifconfig"\n*' +
-+        pattern = ('modules="ifconfig|iproute2"\n*' +
-                    '# Label public\n*' +
-                    'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
-                    'routes_eth0="\s*default via {gateway}\s*"\n*' +
-@@ -429,8 +431,9 @@ def test_gentoo_openrc_ipv6(self):
- 
-         self.assertTrue('net' in outfiles)
- 
-+        # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-         generated = outfiles['net'].rstrip()
-        pattern = ('modules="ifconfig"\n*' +
-+        pattern = ('modules="ifconfig|iproute2"\n*' +
-                    '# Label public\n*' +
-                    'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
-                    'routes_eth0="\s*default via {gateway}\s*"\n*' +
--- a/app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch
+++ b/app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch
@ -1,15 +0,0 @@
-diff -Nuar openstack-guest-agents-unix-1.39.0.orig/scripts/gentoo/nova-agent.in openstack-guest-agents-unix-1.39.0/scripts/gentoo/nova-agent.in
--- openstack-guest-agents-unix-1.39.0.orig/scripts/gentoo/nova-agent.in	2013-12-31 02:02:57.000000000 -0800
-+++ openstack-guest-agents-unix-1.39.0/scripts/gentoo/nova-agent.in	2014-06-21 17:20:01.527148493 -0700
-@@ -35,8 +35,9 @@
- NOVA_PYTHONPATH="${reallibdir}/${NOVA_PYTHONPATH}"
- NOVA_PYTHONPATH="${NOVA_PYTHONPATH}:${NOVA_PYTHONPATH}/site-packages"
- 
-if [ `which python > /dev/null 2>&1 ; echo $?` -eq 0 ]; then
-  PYTHONPATH="$(python -c 'import sys; print ":".join(sys.path)')"
-+PYTHON=python2
-+if [ `which $PYTHON > /dev/null 2>&1 ; echo $?` -eq 0 ]; then
-+  PYTHONPATH="$($PYTHON -c 'import sys; print ":".join(sys.path)')"
- fi
- export PYTHONPATH="$NOVA_PYTHONPATH:$PYTHONPATH"
- export PYTHONHOME="$NOVA_PYTHONPATH:$PYTHONPATH"
--- a/app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch
+++ b/app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch
@ -1,323 +0,0 @@
-commit fc8c9fe076e321ff98cc6717abbb21ee57808c52
-Merge: eaaae09 1ecec49
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date:   Wed Apr 30 15:33:43 2014 +0000
-
-    Merge pull request #43 from gtmanfred/master
-    
-    sbindir changes to exec_prefix
-
-commit eaaae09c27a33998374a8d63702c75b04ab3e5c2
-Merge: 773e431 1505a5a
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date:   Tue Apr 29 18:21:27 2014 +0000
-
-    Merge pull request #45 from leader716/master
-    
-    Added addditional logic to deterine if the hardware address for and inte...
-
-commit 1505a5a8e180910c3307bf04ccfc4eed09c0f40a
-Author: John Ward <john.ward@rackspace.com>
-Date:   Tue Apr 29 14:28:34 2014 +0000
-
-    Added addditional logic to deterine if the hardware address for and interface is 0x0 if so go to the next interface.
-    I put this into place to handle tun adapters that have a hardware address of 0x0 which was causing the agent to
-    segfault when it encounterd this type of adapter.
-
-commit 1ecec499d5bea73980a8aec992b394339acc83c7
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date:   Fri Apr 25 20:38:35 2014 -0500
-
-    sbindir changes to exec_prefix
-    
-    Systemd requires a full path for the start of the command, and there
-    isn't one that isn't a nice way to change this.
-
-commit 773e431997a6612cbda9f11ec9d57f5685a29eea
-Merge: 1ca2056 12c0294
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date:   Fri Apr 25 18:41:56 2014 +0000
-
-    Merge pull request #39 from Camisa/master
-    
-    nova-agent should replace the Slice or Image ID rather than append
-
-commit 1ca2056a455f8075ed951f0a82b92820c0b33b54
-Merge: 1b05c75 f9a365e
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date:   Fri Apr 25 18:40:29 2014 +0000
-
-    Merge pull request #42 from gtmanfred/master
-    
-    Do not add static routes that are the default route, if a default gateway already exists.
-    
-    Courtesy of gtmanfred. Thank you!
-
-commit f9a365e7a9543d407ca9d75164688faa0ff53528
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date:   Fri Apr 25 10:54:29 2014 -0500
-
-    remove extra and from debian network.py
-
-commit 387d4e77695598a07be9e4593c5b236b81a1aeea
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date:   Fri Apr 25 09:31:15 2014 -0500
-
-    Do not add static routes that are the default route
-
-commit 1b05c75530c8b4cbf5347e84815e275ee0bbacd4
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date:   Thu Feb 13 19:26:36 2014 +0000
-
-    Fix nova-agent not starting on some systems
-    
-    data/host existing could cause a fault on xs_handle.mkdir(self.request_path) if request_path (data/host) already existed. Wrap it in a try/except clause to ignore the fault as if the directory already exists, there's no reason to throw an exception while trying to create it.
-    
-    Workaround without this patch is to xenstore-rm data/host from affected VMs, or to do it from dom0 with the full path.
-
-commit 12c02941ef02dc6645e6d4700e8a028decbf0c19
-Author: Christopher J. Camisa <cjc@operator.host>
-Date:   Thu Jan 30 03:11:51 2014 -0600
-
-    nova-agent should replace the Slice or Image ID rather than append
-
-commit ce388bf600136736fdb790edef58a57aad8adfc1
-Author: AbhishekKr <abhikumar163@gmail.com>
-Date:   Tue Jan 21 17:22:23 2014 +0530
-
-    shebang fixed for installer.sh and bintar script; gitignore updated
-
-commit 91fe7d0262fe8ad685a287df291b504250b1184c
-Author: AbhishekKr <abhikumar163@gmail.com>
-Date:   Fri Jan 3 16:51:54 2014 +0530
-
-    FreeBSD changed ports, so bintar creation script need to
-diff --git a/.gitignore b/.gitignore
-index ae1ae1b..6bdeda8 100644
--- a/.gitignore
-+++ b/.gitignore
-@@ -55,3 +55,4 @@ unix/scripts/generic/nova-agent
- unix/scripts/gentoo/nova-agent
- unix/scripts/freebsd/nova-agent
- .idea/*
-+**/.venv
-diff --git a/commands/arch/network.py b/commands/arch/network.py
-index 1d698ca..2bc0aff 100644
--- a/commands/arch/network.py
-+++ b/commands/arch/network.py
-@@ -373,6 +373,11 @@ def _update_rc_conf_legacy(infile, interfaces):
-             ifaces.append((ifname.replace(':', '_'), ' '.join(line)))
- 
-         for i, route in enumerate(interface['routes']):
-+            if route['network'] == '0.0.0.0' and \
-+                    route['netmask'] == '0.0.0.0' and \
-+                    route['gateway'] == gateway4:
-+                continue
-+
-             line = "-net %(network)s netmask %(netmask)s gw %(gateway)s" % \
-                     route
- 
-@@ -499,7 +504,10 @@ def _get_file_data_netctl(ifname, interface):
-             print >>outfile, 'Gateway6=%s' % gateway6
- 
-     routes = ['%(network)s/%(netmask)s via %(gateway)s' % route
-              for route in interface['routes']]
-+              for route in interface['routes'] if not
-+              route['network'] == '0.0.0.0' and not
-+              route['netmask'] == '0.0.0.0' and not
-+              route['gateway'] == gateway4]
- 
-     if routes:
-         print >>outfile, 'Routes=(\'%s\')' % '\' \''.join(routes)
-@@ -552,7 +560,10 @@ def _get_file_data_netcfg(ifname, interface):
-             print >>outfile, 'GATEWAY6="%s"' % gateway6
- 
-     routes = ['"%(network)s/%(netmask)s via %(gateway)s"' % route 
-              for route in interface['routes']]
-+              for route in interface['routes'] if not
-+              route['network'] == '0.0.0.0' and not
-+              route['netmask'] == '0.0.0.0' and not
-+              route['gateway'] == gateway4]
- 
-     if routes:
-         print >>outfile, 'ROUTES=(%s)' % ' '.join(routes)
-diff --git a/commands/debian/network.py b/commands/debian/network.py
-index d91d602..3b82d97 100644
--- a/commands/debian/network.py
-+++ b/commands/debian/network.py
-@@ -234,6 +234,11 @@ def _get_file_data(interfaces):
-             ifname_suffix_num += 1
- 
-         for route in interface['routes']:
-+            if route['network'] == '0.0.0.0' \
-+                    and route['netmask'] == '0.0.0.0'\
-+                    and 'gateway4' in interface \
-+                    and route['gateway'] == interface['gateway4']:
-+                continue
-             file_data += "    post-up route add -net %(network)s " \
-                          "netmask %(netmask)s gw %(gateway)s || true\n" % route
-             file_data += "    pre-down route del -net %(network)s " \
-diff --git a/commands/freebsd/network.py b/commands/freebsd/network.py
-index 2d5d7f1..87e5e9e 100644
--- a/commands/freebsd/network.py
-+++ b/commands/freebsd/network.py
-@@ -211,6 +211,10 @@ def _create_rcconf_file(infile, interfaces, hostname):
-             ifname_suffix_num += 1
- 
-         for route in interface['routes']:
-+            if route['network'] == '0.0.0.0' and \
-+                    route['netmask'] == '0.0.0.0' and \
-+                    route['gateway'] == gateway4:
-+                continue
-             if ':' in route['network']:
-                 # ipv6
-                 fmt = '-net %(network)s/%(netmask)s %(gateway)s'
-diff --git a/commands/gentoo/network.py b/commands/gentoo/network.py
-index f3ceff5..f3e5251 100644
--- a/commands/gentoo/network.py
-+++ b/commands/gentoo/network.py
-@@ -199,7 +199,11 @@ def _confd_net_file(interfaces):
-         lines.extend([ "  {0}/{1} via {2}".format(route['network'],
-                         commands.network.NETMASK_TO_PREFIXLEN[route['netmask']],
-                         route['gateway']
-                    ) for route in interface['routes'] ])
-+                    ) for route in interface['routes'] if not 
-+                    route['network'] == '0.0.0.0' and not
-+                    route['netmask'] == '0.0.0.0' and
-+                    'gateway4' in interface and not
-+                    route['gateway'] == interface['gateway4']])
-         if 'gateway4' in interface and interface['gateway4']:
-             lines.append("  default via {0}".format(interface['gateway4']))
-         if 'gateway6' in interface and interface['gateway6']:
-@@ -247,7 +251,11 @@ def _confd_net_file_legacy(interfaces):
-         lines.append("routes_{0}=(".format(name))
-         lines.extend([ "  \"{0} netmask {1} gw {2}\"".format(
-                         route['network'], route['netmask'], route['gateway']
-                    ) for route in interface['routes'] ])
-+                    ) for route in interface['routes'] if not 
-+                    route['network'] == '0.0.0.0' and not
-+                    route['netmask'] == '0.0.0.0' and
-+                    'gateway4' in interface and not
-+                    route['gateway'] == interface['gateway4'] ])
-         if 'gateway4' in interface and interface['gateway4']:
-             lines.append("  \"default via {0}\"".format(interface['gateway4']))
-         if 'gateway6' in interface and interface['gateway6']:
-diff --git a/commands/redhat/network.py b/commands/redhat/network.py
-index a85ed6b..e853fbd 100644
--- a/commands/redhat/network.py
-+++ b/commands/redhat/network.py
-@@ -202,6 +202,11 @@ def _get_file_data(ifname_prefix, interface):
- 
-     route_data = ''
-     for i, route in enumerate(interface['routes']):
-+        if route['network'] == '0.0.0.0' and \
-+                route['netmask'] == '0.0.0.0' and \
-+                'gateway4' in interface and \
-+                route['gateway'] == interface['gateway4']:
-+            continue
-         route_data += "ADDRESS%d=%s\n" % (i, route['network'])
-         route_data += "NETMASK%d=%s\n" % (i, route['netmask'])
-         route_data += "GATEWAY%d=%s\n" % (i, route['gateway'])
-diff --git a/commands/suse/network.py b/commands/suse/network.py
-index 2947974..baad7b2 100644
--- a/commands/suse/network.py
-+++ b/commands/suse/network.py
-@@ -191,6 +191,10 @@ def _get_file_data(ifname, interface):
- 
-     route_data = ''
-     for route in interface['routes']:
-+        if route['network'] == '0.0.0.0' and \
-+                route['netmask'] == '0.0.0.0' and \
-+                route['gateway'] == gateway4:
-+            continue
-         network = route['network']
-         netmask = route['netmask']
-         gateway = route['gateway']
-diff --git a/lib/agentlib.c b/lib/agentlib.c
-index ccba6e3..cced430 100644
--- a/lib/agentlib.c
-+++ b/lib/agentlib.c
-@@ -73,7 +73,10 @@ static PyObject *_agentlib_get_interfaces(PyObject *self, PyObject *args)
-             goto next;
- 
- #if defined(__linux__)
-        if (ifa->ifa_addr->sa_family != PF_PACKET)
-+        if (ifa->ifa_addr == NULL)
-+	    goto next;
-+
-+	if (ifa->ifa_addr->sa_family != PF_PACKET)
-             goto next;
- 
-         struct sockaddr_ll *sll = (struct sockaddr_ll *)ifa->ifa_addr;
-diff --git a/plugins/xscomm.py b/plugins/xscomm.py
-index e3faa2e..9b8a33b 100644
--- a/plugins/xscomm.py
-+++ b/plugins/xscomm.py
-@@ -41,7 +41,11 @@ class XSComm(object):
-                 XENSTORE_RESPONSE_PATH)
- 
-         self.xs_handle = pyxenstore.Handle()
-        self.xs_handle.mkdir(self.request_path)
-+        try:
-+            self.xs_handle.mkdir(self.request_path)
-+        except:
-+            pass
-+
-         self.requests = []
- 
-     def _check_handle(self):
-diff --git a/scripts/gentoo/nova-agent.in b/scripts/gentoo/nova-agent.in
-index a043394..7f2687e 100755
--- a/scripts/gentoo/nova-agent.in
-+++ b/scripts/gentoo/nova-agent.in
-@@ -59,7 +59,7 @@ start() {
-         /usr/bin/xenstore write data/host/system-init '{"name":"resetnetwork","value":""}'
-         /usr/bin/xenstore watch -n 1 data/guest/system-init >/dev/null
-         [ "$(/usr/bin/xenstore read data/guest/system-init | wc -l)" -gt "0" ] || eend 1
-        echo "UUID=\"$(/usr/bin/xenstore read name)\"" >> /etc/conf.d/nova-agent
-+        echo "UUID=\"$(/usr/bin/xenstore read name)\"" > /etc/conf.d/nova-agent
-     fi
- 
-     eend $RET
-diff --git a/scripts/installer.sh.in b/scripts/installer.sh.in
-index 8ef793d..3fbf352 100755
--- a/scripts/installer.sh.in
-+++ b/scripts/installer.sh.in
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/usr/bin/env bash
- 
- # vim: tabstop=4 shiftwidth=4 softtabstop=4
- #
-diff --git a/scripts/systemd/nova-agent.service.in b/scripts/systemd/nova-agent.service.in
-index 9d8a4a7..b73ebbe 100644
--- a/scripts/systemd/nova-agent.service.in
-+++ b/scripts/systemd/nova-agent.service.in
-@@ -4,7 +4,7 @@ Description=nova-agent service
- [Service]
- Environment=LD_LIBRARY_PATH=@prefix@/share/@PACKAGE@/@PACKAGE_VERSION@/lib
- EnvironmentFile=-/etc/nova-agent.env
-ExecStart=@sbindir@/nova-agent -n -l info @prefix@/share/@PACKAGE@/nova-agent.py
-+ExecStart=@prefix@/sbin/nova-agent -n -l info @prefix@/share/@PACKAGE@/nova-agent.py
- 
- 
- [Install]
-diff --git a/tools/nova-agent-builder.sh b/tools/nova-agent-builder.sh
-index 1823639..fcaa7c7 100755
--- a/tools/nova-agent-builder.sh
-+++ b/tools/nova-agent-builder.sh
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/usr/bin/env bash
- ##### NOVA AGENT BUILDER
- ##### how_to:$ sh nova-agent-builder.sh help
- ##### W.I.P. works fine for most of cases,
-@@ -202,7 +202,7 @@ install_pre_requisite_freebsd(){
-     export INSTALL_D=""
-     uname -a
- 
-    pkg_add -r git autogen automake wget bash
-+    pkg_add -r git autogen automake wget bash libtool
-     pkg_add -r py27-unittest2 py27-cryptkit py27-pycrypto py27-mox
- 
-     # re-install xen-tool :: required for pyxenstore install
--- a/app-emulation/openstack-guest-agents-unix/metadata.xml
+++ b/app-emulation/openstack-guest-agents-unix/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rackerlabs/openstack-guest-agents-unix</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
-
-inherit autotools eutils vcs-snapshot python-single-r1
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-util/patchelf
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyxenstore[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/patches-1.39.0-20140621.patch \
-		"${FILESDIR}"/openstack-guest-agents-unix-1.39.0-python2.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doinitd scripts/gentoo/nova-agent
-}
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
-
-inherit autotools eutils vcs-snapshot python-single-r1
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-util/patchelf
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyxenstore[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/patches-1.39.0-20140621.patch \
-		"${FILESDIR}"/openstack-guest-agents-unix-1.39.0-python2.patch
-	# Ignore the deps of install-exec-local
-	sed -i -e '/^install-exec-local:/s,:.*,:,g' Makefile.am
-	# bashism fix
-	sed -r -i -e '/^export ([A-Z_]+)/{ s,^export ,,g; s,^([A-Z0-9_]+)(.*),\1\2; export \1,g; }' scripts/gentoo/nova-agent.in
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doinitd scripts/gentoo/nova-agent
-}
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils vcs-snapshot
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-util/patchelf
-	dev-python/pycrypto
-	dev-python/pyxenstore
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doinitd scripts/gentoo/nova-agent
-}
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pyxenstore[${PYTHON_USEDEP}]
-	dev-util/patchelf
-	${PYTHON_DEPS}
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mox[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/4453b4773688eef6c60736d9cf07100716308a5e.patch \
-		"${FILESDIR}"/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
-
-	# Note: https://github.com/rackerlabs/openstack-guest-agents-unix/issues/52
-	ebegin 'patching tests/test_injectfile.py'
-	sed \
-		-e '97,127 d' \
-		-i tests/test_injectfile.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	doinitd scripts/gentoo/nova-agent
-}
-
-pkg_postinst() {
-	elog "If you would like to utilize openstack-guest-agents-unix, add 'nova-agent' to"
-	elog "your 'default' runlevel:"
-	elog "  rc-update add nova-agent default"
-}
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools linux-info python-single-r1
-
-COMMIT="c9a4f15b8c8f2349601d3073cc95e30d3b91af13"
-
-DESCRIPTION="Unix Guest Agent for OpenStack"
-HOMEPAGE="https://wiki.openstack.org/wiki/GuestAgent"
-SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror strip"
-
-DEPEND="
-	app-emulation/xe-guest-utilities[-xenstore]
-	dev-util/patchelf
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	test? ( dev-python/mox[${PYTHON_USEDEP}] )
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-emulation/xe-guest-utilities
-	dev-python/pyxenstore[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-S=${WORKDIR}/${PN}-${COMMIT}
-
-# Required for Emergency Console
-CONFIG_CHECK="~KEYBOARD_ATKBD"
-
-pkg_setup()
-{
-	python-single-r1_pkg_setup
-}
-
-src_prepare()
-{
-	# Note: https://github.com/rackerlabs/openstack-guest-agents-unix/issues/52
-	ebegin 'patching tests/test_injectfile.py'
-	sed -e '97,127 d' -i tests/test_injectfile.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	eapply_user
-	eautoreconf
-}
-
-src_install()
-{
-	emake DESTDIR="${D}" install || die
-	doinitd scripts/gentoo/nova-agent
-}
-
-pkg_postinst()
-{
-	if [ "$(rc-config list default | grep nova-agent)" = "" ] ; then
-		elog "To start nova-agent automatically by default"
-		elog "you should add it to the default runlevel :"
-		elog "\`rc-update add nova-agent default\`"
-		elog
-	fi
-}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/poedit/poedit-2.2.3.ebuild
+++ b/app-i18n/poedit/poedit-2.2.3.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"

-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
 LICENSE="MIT"
 SLOT="0"

--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@ -1,3 +1,2 @@
-DIST blackbox_exporter-0.14.0.tar.gz 670297 BLAKE2B e55186723b7877296a62840c842acb87c95f4e060b059c6a5861a6eb6a8bb8ad14c6082f466427ddf048c49fca8df79668c64b77b1dcf64b1239ed5b62c829e3 SHA512 58f379cdeef671376105532450ffb3a6fef0ea071d493fbef40d761c6cbaec47bb49c9c2e5c070f3d0e598396d7ad9b2c5af100c9a69aee04877442c7bdaf120
-DIST blackbox_exporter-0.15.0.tar.gz 2157865 BLAKE2B dee707d8cf568da01e7981a9c2879fb209fac6d640d2cc1905231d56c9e6f8007da8eec09ff89cba82e40ac159529b1a9144aa0b50094a8b798102b19502404b SHA512 dff23d51292ed7b56f403d9a70c02a4d4e1f2a43f0bd6763598b310c07c7564d39fbed29c7b2b03b1848d33c3779b4922396212a3c9252c8149fdd9208d8a3b7
 DIST blackbox_exporter-0.15.1.tar.gz 2120525 BLAKE2B c21a621dce663ccbc184c87b66e894ddc6a94bee9bbd2b9fb432a4d349afb35410f07ad150e946c5f8eb9ec8e6e7f2e6d4cbcafe118e8b2efe34902fbd0bf38a SHA512 2c7d0989bc70982a0fd528c7c6ed5ec6686f5e93db0a90db2b06e4e578503443da0750aaa2d6a01ae4fcd4c722eef522c0e06b019aa59a2eb837f233e317d4e2
+DIST blackbox_exporter-0.16.0.tar.gz 2121367 BLAKE2B 92c55dbc3f47d7a2d8c37ad116857dd1d7314a6684d9f228039b09cc086edf72bdf5e0c2cc770ce45d687c45a38f6de72e612c0491ec66f836bed28b75b2e5a9 SHA512 85103b62e345ab5d59626e658047ac75649f9ef991c9bbaff32b95ea75ec2da2bf916573e664520766158805c6cf24163f2850c885a594d32b4f9c4c9dbed1a8
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="bba7ef7"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-util/promu"
-
-FILECAPS=(
-	cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
@ -6,7 +6,7 @@ inherit fcaps user golang-build golang-vcs-snapshot

 EGO_PN="github.com/prometheus/blackbox_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="3f726a8"
+BLACKBOX_EXPORTER_COMMIT="991f898"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/jq/jq-1.6-r3.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"

 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs"

 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
--- a/app-misc/ranger/metadata.xml
+++ b/app-misc/ranger/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>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<longdescription lang="en">
 	Ranger is a console file manager that gives you greater flexibility and a
 	good overview of your files without having to leave your console. It
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 # tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/4" # based on SONAME of libusbmuxd.so
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="kernel_linux static-libs"

 RDEPEND="
--- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 # src/utils.h is LGPL-2.1+, rest is found in COPYING*
 LICENSE="GPL-2 GPL-3 LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""

 RDEPEND="
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/elogv/elogv-0.7.8-r1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 DOCS=( README )

--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@ -1,2 +1 @@
-DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
 DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
--- a/app-text/cedilla/cedilla-0.6.ebuild
+++ b/app-text/cedilla/cedilla-0.6.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="UTF-8 to postscript converter"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-lisp/clisp"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/cedilla-gentoo-r1.patch
-}
-
-src_compile() {
-	./compile-cedilla || die "Compile failed."
-}
-
-src_install() {
-	sed -i "s#${ED%/}##g" cedilla || die "sed failed"
-	newman cedilla.man cedilla.1
-	./install-cedilla || die "Install failed."
-	dodoc NEWS README
-}
--- a/app-text/cedilla/cedilla-0.7.ebuild
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@ -7,7 +7,7 @@ DESCRIPTION="UTF-8 to postscript converter"
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
 SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"

-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"

--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@ -1,5 +1,2 @@
-DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
-DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
-DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
-DIST qpdf-9.0.1.tar.gz 18172693 BLAKE2B ddb389b773b4664c1c3da270f1804f015c8f0a04ed57df7a4a1de9ff80cd47c6fd07c29836573bd6459cde42e8fd3986855a68632495df5363d220d6062669c7 SHA512 1bca5cf39f0019443f744c01ddc93773febca6883063fcec7f3541dd68359d8da44f34cf111cacb3bd9564f10bf1b09ea58173efd3ae06116e5c3832e61e82cc
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
+DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
--- a/app-text/qpdf/qpdf-8.4.1.ebuild
+++ b/app-text/qpdf/qpdf-8.4.1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
--- a/app-text/qpdf/qpdf-8.4.2.ebuild
+++ b/app-text/qpdf/qpdf-8.4.2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@ -15,6 +15,8 @@ SLOT="0/26"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"

+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0=
--- a/app-text/qpdf/qpdf-9.1.0.ebuild
+++ b/app-text/qpdf/qpdf-9.1.0.ebuild
@ -15,7 +15,10 @@ SLOT="0/26"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"

+RESTRICT="!test? ( test )"
+
 CDEPEND="
+	net-libs/gnutls:0=
 	sys-libs/zlib
 	virtual/jpeg:0=
 "
@ -35,6 +38,10 @@ DOCS=( ChangeLog README.md TODO )

 src_configure() {
 	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
 		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
 	)
@ -53,5 +60,5 @@ src_install() {
 		dobin examples/build/.libs/*
 	fi

-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
--- a/app-text/txt2man/txt2man-1.6.0.ebuild
+++ b/app-text/txt2man/txt2man-1.6.0.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""

 RDEPEND="app-shells/bash
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@ -1,4 +1 @@
-DIST pgadmin4-4.10.tar.gz 22809776 BLAKE2B 70a9857de31721b1cd5816b9e15abf325516f94ad5248f3ce5387cca5081ba96d7fca6c487265960ffac8d63c2fd09c3dea44d24a1cc9f8dbb170bd76d5de545 SHA512 b7f91d85fdc39766a294d9b66e8539f709b99f971726551d013345595161ff017e03505f05a41352575892be9d9622e86f4ccdbac76bcea435e2fb88a690b565
 DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707
-DIST pgadmin4-4.5.tar.gz 22420769 BLAKE2B ae16e34c4cfce0ae78f06321ea1fc34aac0e081df4c0d5906fc4da0c82abb67e374477b8f9a9266d003579eb8887541e4224465ce6eccd86589129e1b3efff24 SHA512 835434612ac2a7ff89fab4c4bed89644e43506491ce12d2b74ffdbc25b33f2ac9ae566c95e886d4b4f8bca6499c40be5f0d776b18bfdcebd44d7ffe3b89deb5f
-DIST pgadmin4-4.8.tar.gz 22780924 BLAKE2B 7b64ef8ac3782e9c8207d5938f3638d67ddf5c86ca520afbfb296a824b39411362ca6e9d8b03920e35cca38d1303efe81750e5bfc849cfb363f370da3d25ac44 SHA512 68b35c1091435fbeb39e67c7f93038fcba95cd5ae7098434b5d3afee10595f875ef9fd997934f2bbd93c914bcd5c3c71bd43f032f788e55c5795f5ad63b57cd7
--- a/dev-db/pgadmin4/pgadmin4-4.10.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.10.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
--- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.13.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"

 LICENSE="POSTGRESQL"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="doc"

--- a/dev-db/pgadmin4/pgadmin4-4.5.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
--- a/dev-db/pgadmin4/pgadmin4-4.8.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.8.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@ -1,3 +1,4 @@
 DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
 DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6 SHA512 2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
+DIST pgbouncer-1.12.0.tar.gz 567465 BLAKE2B 866a877478a417b3854e6e2a724fcd06c04bd94893e5d79f8bf250fa9391407c5b7cd00bf2771af18b162dfd2b7bdced00be15c44ba74cf842e3d98c561991e3 SHA512 017d150f865df231861cda4678963ad7e63a0cd238f5ece5679c920484e01c53ab27af63bf47e6227d66b7dc94b4d59ca41ac49c26f60aba74d40b43cad55664
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
--- a/dev-db/pgbouncer/files/pgbouncer-1.12-dirs.patch
+++ b/dev-db/pgbouncer/files/pgbouncer-1.12-dirs.patch
@ -0,0 +1,31 @@
+--- a/etc/pgbouncer.ini
+++ b/etc/pgbouncer.ini
+@@ -43,7 +43,9 @@
+ ;;;
+ 
+ logfile = /var/log/pgbouncer/pgbouncer.log
+-pidfile = /var/run/pgbouncer/pgbouncer.pid
+
+; Leave unset. This is handled in the initscript.
+;pidfile =
+ 
+ ;;;
+ ;;; Where to wait for clients
+@@ -53,11 +55,12 @@
+ listen_addr = 127.0.0.1
+ listen_port = 6432
+ 
+-;; Unix socket is also used for -R.
+-;; On Debian it should be /var/run/postgresql
+-;unix_socket_dir = /tmp
+-;unix_socket_mode = 0777
+-;unix_socket_group =
+; Unix socket is also used for -R (online restart), but the
+; initscripts can't do that. Generally, you'll want to leave these
+; alone. System-wide default is: /run/postgresql
+unix_socket_dir = /run/postgresql
+unix_socket_mode = 0777
+unix_socket_group = postgres
+ 
+ ;;;
+ ;;; TLS settings for accepting clients
--- a/dev-db/pgbouncer/files/pgbouncer.initd-r2
+++ b/dev-db/pgbouncer/files/pgbouncer.initd-r2
--- a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://www.pgbouncer.org/"
+SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl -udns"
+
+# At-most-one-of, one can be enabled but not both
+REQUIRED_USE="?? ( c-ares udns )"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0
+	>=sys-libs/glibc-2.10
+	c-ares? ( >=net-dns/c-ares-1.10 )
+	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
+	udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+# Tests require a local database server, wants to fiddle with iptables,
+# and doesn't support override. things.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
+
+	default
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_with c-ares cares) \
+		$(use_enable debug cassert) \
+		$(use_with pam) \
+		$(use_with ssl openssl) \
+		$(use_with udns)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+	use doc && dodoc doc/*.rst
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
+
+	insinto /etc
+	doins etc/pgbouncer.ini
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Please read the config.txt for Configuration Directives"
+		einfo
+		einfo "For Administration Commands, see:"
+		einfo "    man pgbouncer"
+		einfo
+		einfo "By default, PgBouncer does not have access to any database."
+		einfo "GRANT the permissions needed for your application and make sure that it"
+		einfo "exists in PgBouncer's auth_file."
+	fi
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -3,4 +3,4 @@ DIST php-7.1.33.tar.xz 12370228 BLAKE2B 610f501c1729ca3f5fa6f104b9f229046cf1e497
 DIST php-7.2.24.tar.xz 12302284 BLAKE2B 3c864e72d9fce1f13295385e20708a632087b2e4ffdc9e0012191cb2e17a3530f26797ad03c595bea60cccf850fe17028f2a379e50f32bd4db82530e0fcd727f SHA512 39597b8328cb4d5284288bdce8dd9c7ef8446e46914de93203700efaf67f85ad5b69df777bea14eef9160b233fb79bcb60f6750c0df011bbf610b62a524689e3
 DIST php-7.3.11.tar.xz 12092412 BLAKE2B 0f326b85756cfb5ca96a43d7bfbe8aebd3bb9e9ede06734fb00dc3551372d53befba9e87f5f6a0b0b9e62d35a2eedacd1fa500e1eeff908e05ff52be730c61b4 SHA512 150cb202efc4cc1df042a2cbb9368a2d29aefd1d0cf1a0b0bd7238ba5cb6c4b828e23f2d42b4ecd77dd54f73141a33fc3b36ca0764320e9ba470c9549a7f0291
 DIST php-7.4.0RC6.tar.xz 10229764 BLAKE2B e1de007b6b63fee878ccb0d8ea1d1c067210e93978076a7d4925d6d0902ebe514b1238a00e9f662130183f474395500f3335b91e7ebca381a864b7654582f9a1 SHA512 2f20f3b78bbb4df8e59da6d4c2eb18ec22c4bf49d3b7e6f497600f13669fdd4e7ebbf98a7e75948eaa6e9c72bbb160b2b8c91c564268cdc01570560bad682c05
-DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e
+DIST php-patches-7.1.33bp.tar.bz2 39945 BLAKE2B 9f7137f61b7ea07cc263b054401a319042f5a40d6cdaf3561a45778ae009e3279c72f2a6a0f9c97805bc39acef1c8c9d72d290c2ce873f44209fb2d65d620810 SHA512 8e36fb57bdadfcc4e976ecb7dc8f44290dc3b507eb27f4445aa2c8eba528e7cb53286e7fd9b1b9141f12fd6e29278282e4f0eb6445ed06046dd48a1d5d1bc789
--- a/dev-lang/php/php-5.6.40-r7.ebuild
+++ b/dev-lang/php/php-5.6.40-r7.ebuild
@ -5,7 +5,7 @@ EAPI="7"

 inherit autotools flag-o-matic systemd

-PATCH_V="7.1.31bp"
+PATCH_V="7.1.33bp"

 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
--- a/dev-lang/sassc/sassc-3.6.0.ebuild
+++ b/dev-lang/sassc/sassc-3.6.0.ebuild
@ -6,7 +6,7 @@ EAPI=7
 inherit autotools

 SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"

 DESCRIPTION="A libsass command line driver"
 HOMEPAGE="https://github.com/sass/sassc"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"

 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 DEPEND=">=sys-kernel/linux-headers-3.17"
--- a/dev-libs/libsass/libsass-3.6.1.ebuild
+++ b/dev-libs/libsass/libsass-3.6.1.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi

 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"

 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
--- a/dev-libs/libspnav/libspnav-0.2.3.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="X"

 CDEPEND="X? ( x11-libs/libX11 )"
--- a/dev-libs/libtecla/libtecla-1.6.3.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"

 LICENSE="icu"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 DEPEND="sys-libs/ncurses:="
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}

 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"

 src_prepare() {
--- a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="ZLIB"
 SLOT="0/7"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
--- a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"

 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t

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

 RDEPEND=""
--- a/dev-python/cryptography/cryptography-2.8.ebuild
+++ b/dev-python/cryptography/cryptography-2.8.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"

--- a/dev-python/cython/cython-0.29.14-r1.ebuild
+++ b/dev-python/cython/cython-0.29.14-r1.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
+++ b/dev-python/cython/files/cython-0.29.14-sphinx-update.patch
@ -0,0 +1,13 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 10662e28c..a84e0b928 100644
+--- a/docs/conf.py
+++ b/docs/conf.py
+@@ -41,7 +41,7 @@ highlight_language = 'cython'
+ extensions = [
+     'ipython_console_highlighting',
+     'cython_highlighting',
+-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
+     'sphinx.ext.todo',
+     'sphinx.ext.intersphinx',
+     'sphinx.ext.autodoc'
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"

 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="
--- a/dev-python/flask-login/flask-login-0.4.1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"

 RDEPEND=">=dev-python/flask-0.10[${PYTHON_USEDEP}]"
--- a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"

 RDEPEND="
--- a/dev-python/glance_store/glance_store-1.0.1.ebuild
+++ b/dev-python/glance_store/glance_store-1.0.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="cinder swift vmware"

 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15`