Sync with portage [Fri Apr 5 16:54:03 MSK 2019].

2019-04-05 16:54:04 +03:00 · 2019-04-05 16:54:04 +03:00 · 78afc7d83e
commit 78afc7d83e
parent f9197bec75
565 changed files with 7534 additions and 6305 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,5 +1,7 @@
 DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
 DIST ansible-2.6.15.tar.gz 10734433 BLAKE2B 9c48d9de348a11a57b364921af26154b5a2106d0bfa2d7d341c06e2408b3f71d30b3cc2f5e4df1bb21eb6eebd39a4d297ce8d697d68826378d4e786a4acb4e25 SHA512 14951db33ed2124b3379adf1114a9c980f63668c18a79d436658d8ddc1bbbd38f26682520319bd0e399d6ced518ece0f01da5a6991003e8b30adf78f20c6d1e8
+DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
+DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
 DIST ansible-2.7.8.tar.gz 11812884 BLAKE2B 867ed7072efc4effafd637ac0353bd722269046cae8ddb794eea8c6cf9d739bc567f2a5323a589c21a74bbb57565ef153fb8c52798c17809a42400abe72ce65c SHA512 f3501ce8b642f83fe3d5e21cdfa26bce8611e92bc6e68e40b3a7ff2443c7d8ee0b2175981c92a5e83f9ce8c5d7d75aac95106a237bb9325c66319d96a790009a
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
--- a/app-admin/ansible/ansible-2.6.16.ebuild
+++ b/app-admin/ansible/ansible-2.6.16.ebuild
@ -0,0 +1,66 @@
+# 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} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
--- a/app-admin/ansible/ansible-2.7.10.ebuild
+++ b/app-admin/ansible/ansible-2.7.10.ebuild
@ -0,0 +1,66 @@
+# 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} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
--- a/app-admin/helm/files/helm-2.12.0-sorting.patch
+++ b/app-admin/helm/files/helm-2.12.0-sorting.patch
@ -1,90 +0,0 @@
-From c9a5b0bb49b91a463c0021dd5dbe9626e2d3bb11 Mon Sep 17 00:00:00 2001
-From: Filinto Duran <duranto@gmail.com>
-Date: Fri, 14 Dec 2018 10:20:57 -0600
-Subject: [PATCH] fixes #4728 problem that arise because of the zero value of
- unknown and the loging of kind_sorter this messes helm template when having
- unknown (ie NOTES) or other files and the sorter catches namespace
-
-Signed-off-by: Filinto Duran <duranto@gmail.com>
---
- pkg/tiller/kind_sorter.go      | 13 ++++++++----
- pkg/tiller/kind_sorter_test.go | 36 ++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 4 deletions(-)
-
-diff --git a/pkg/tiller/kind_sorter.go b/pkg/tiller/kind_sorter.go
-index 8aff4e6c11..7df63c6ac4 100644
--- a/pkg/tiller/kind_sorter.go
-+++ b/pkg/tiller/kind_sorter.go
-@@ -124,12 +124,13 @@ func (k *kindSorter) Less(i, j int) bool {
- 	b := k.manifests[j]
- 	first, aok := k.ordering[a.Head.Kind]
- 	second, bok := k.ordering[b.Head.Kind]
-	// if same kind (including unknown) sub sort alphanumeric
-	if first == second {
-		// if both are unknown and of different kind sort by kind alphabetically
-		if !aok && !bok && a.Head.Kind != b.Head.Kind {
-+	// if both are unknown
-+	if !aok && !bok {
-+		// and of different kind sort by kind alphabetically
-+		if a.Head.Kind != b.Head.Kind {
- 			return a.Head.Kind < b.Head.Kind
- 		}
-+		// and of same kind sort by name alphabetically
- 		return a.Name < b.Name
- 	}
- 	// unknown kind is last
-@@ -139,6 +140,10 @@ func (k *kindSorter) Less(i, j int) bool {
- 	if !bok {
- 		return true
- 	}
-+	// if same kind sort alphanumeric
-+	if first == second {
-+		return a.Name < b.Name
-+	}
- 	// sort different kinds
- 	return first < second
- }
-diff --git a/pkg/tiller/kind_sorter_test.go b/pkg/tiller/kind_sorter_test.go
-index 1c187e90d5..823d9674ee 100644
--- a/pkg/tiller/kind_sorter_test.go
-+++ b/pkg/tiller/kind_sorter_test.go
-@@ -223,3 +223,39 @@ func TestKindSorterSubSort(t *testing.T) {
- 		})
- 	}
- }
-+
-+func TestKindSorterUnknownsWithNamespace(t *testing.T) {
-+	// a.Kind=Namespace should win over b.Kind=Unknown even if the a.Name > b.Name
-+	manifests := []Manifest{
-+		{
-+			Name: "a",
-+			Head: &util.SimpleHead{Kind: "Namespace"},
-+		},
-+		{
-+			Name: "N",
-+			Head: &util.SimpleHead{Kind: "Unknown"},
-+		},
-+	}
-+	for _, test := range []struct {
-+		description string
-+		order       SortOrder
-+		expected    string
-+	}{
-+		// expectation is sorted by kind (unknown is last) and then sub sorted alphabetically within each group
-+		{"Namespace,Unknown", InstallOrder, "aN"},
-+	} {
-+		var buf bytes.Buffer
-+		t.Run(test.description, func(t *testing.T) {
-+
-+			defer buf.Reset()
-+			m := make([]Manifest, len(manifests))
-+			copy(m, manifests)
-+			for _, r := range sortByKind(m, test.order) {
-+				buf.WriteString(r.Name)
-+			}
-+			if got := buf.String(); got != test.expected {
-+				t.Errorf("Expected %q, got %q", test.expected, got)
-+			}
-+		})
-+	}
-+}
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
+++ b/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
@ -1,54 +0,0 @@
-https://bugs.gentoo.org/649516
-
-Description: fix compatibility with zlib 1.2.9 and newer
-Author: Marc Deslauriers <marc.deslauriers@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
-
-Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c
-===================================================================
--- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c	2017-08-08 15:20:06.651685637 -0400
-+++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c	2017-08-15 15:45:14.645714766 -0400
-@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
-         cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
-         return -1;
-     }
-    memset(&stream, 0, sizeof(stream));
-    ret = inflateInit2(&stream, windowBits);
-+
-+    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
-+    if (!b) {
-+        return -1;
-+    }
-+    ctx->inflates = b;
-+    ctx->ninflates = n;
-+    b = &b[n-1];
-+
-+    b->from = from;
-+    b->to = to;
-+    b->needSync = 0;
-+    memset(&b->stream, 0, sizeof(stream));
-+    ret = inflateInit2(&b->stream, windowBits);
-     switch (ret) {
-         case Z_MEM_ERROR:
-             cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
-@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
-             cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
-             return -1;
-     }
-
-    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
-    if (!b) {
-        inflateEnd(&stream);
-        return -1;
-    }
-    ctx->inflates = b;
-    ctx->ninflates = n;
-    b = &b[n-1];
-
-    b->from = from;
-    b->to = to;
-    b->needSync = 0;
-    memcpy(&b->stream, &stream, sizeof(stream));
-     return n-1;
- }
- 
--- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
+++ b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
@ -1,11 +0,0 @@
--- clamav-0.99.4/libclamav/regex_pcre.c_orig   2018-03-02 19:10:39.702899702 +0100
-+++ clamav-0.99.4/libclamav/regex_pcre.c        2018-03-02 19:09:27.600901912 +0100
-@@ -112,7 +112,8 @@
- #if USING_PCRE2
- int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override)
- {
-    int errornum, erroffset;
-+    int errornum;
-+    size_t erroffset;
-     pcre2_general_context *gctx;
-     pcre2_compile_context *cctx;
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@ -1,3 +1,2 @@
-DIST 7.1.4.4-TIV-TSMBAC-LinuxX86.tar 220456960 BLAKE2B 1deb7f40b0db899dba475d83d4f22d602563b30c491d280f478e69c558677b9d09e49050eace4275e083eeeb670df2e545ad65abc2abf9dade1e35c947e581f6 SHA512 5f0b0262ad4b8f1dc6d9763735c3390a9ea0d559a3efd08593c6aa81e89978387906ff728a5dee575725da7d0b7e4f4e6d207111b79625c6487b6e8d56d767de
 DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
--- a/app-backup/tsm/tsm-7.1.4.4-r3.ebuild
+++ b/app-backup/tsm/tsm-7.1.4.4-r3.ebuild
@ -1,231 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator multilib eutils readme.gentoo rpm systemd user pax-utils
-
-DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
-HOMEPAGE="http://www.tivoli.com/"
-
-MY_PV_MAJOR=$(get_major_version)
-MY_PV_MINOR=$(get_version_component_range 2)
-MY_PV_TINY=$(get_version_component_range 3)
-MY_PV_PATCH=$(get_version_component_range 4)
-
-MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
-MY_PVR_ALLDOTS=${PV}
-
-if [[ ${MY_PV_PATCH} == 0 ]]; then
-	MY_RELEASE_PATH=maintenance
-else
-	MY_RELEASE_PATH=patches
-fi
-BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
-BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
-BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
-SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
-SRC_URI="${BASE_URI}${SRC_TAR}"
-
-RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
-LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
-	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
-	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
-	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
-
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="acl java +tsm_cit +tsm_hw"
-QA_PREBUILT="*"
-
-# not available (yet?)
-#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
-#	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
-MY_LANG_PV="${MY_PVR_ALLDOTS}-"
-for lang in ${MY_LANGS}; do
-	IUSE="${IUSE} l10n_${lang%:*}"
-	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
-${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
-${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
-done
-unset lang
-
-DEPEND=""
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	sys-fs/fuse:0
-	acl? ( sys-apps/acl )
-	java? ( >=virtual/jre-1.7 )
-"
-
-S="${WORKDIR}/bacli"
-
-pkg_setup() {
-	enewgroup tsm
-	DOC_CONTENTS="
-		Note that you have to be either root or member of the group tsm to
-		be able to use the Tivoli Storage Manager client."
-}
-
-src_unpack() {
-	local rpm rpms lang
-	unpack ${SRC_TAR}
-
-	cd "${S}"
-	for rpm in *.rpm; do
-		case ${rpm} in
-			TIVsm-APIcit.*|TIVsm-BAcit.*)
-				use tsm_cit && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-BAhdw.*)
-				use tsm_hw && rpms="${rpms} ./${rpm}"
-				;;
-			TIVsm-JBB.*|*-filepath-*)
-				# "journal based backup" for all filesystems
-				# requires a kernel module.
-				# "Linux Filepath source code" available
-				# by request from vendor
-				;;
-			*)
-				rpms="${rpms} ./${rpm}"
-				;;
-		esac
-	done
-	for rpm in ${A}; do
-		case ${rpm} in
-			*.rpm)
-				rpms="${rpms} ${rpm}"
-				;;
-		esac
-	done
-
-	rpm_unpack ${rpms}
-
-	# Avoid strange error messages caused by read-only files
-	chmod -R u+w "${S}" || die
-}
-
-src_install(){
-	cp -a opt "${D}" || die
-	cp -a usr "${D}" || die
-
-	# The RPM files contain postinstall scripts which can be extracted
-	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
-	# Below we try to mimic the behaviour of these scripts.
-	# We don't deal with SELinux compliance (yet), though.
-	local RPM_INSTALL_PREFIX CLIENTDIR i
-	RPM_INSTALL_PREFIX=/opt
-	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
-
-	# Create links for messages; this is spread over several postin scripts.
-	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
-	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
-	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
-	#done
-
-	# Mimic TIVsm-API64 postinstall script
-	for i in libgpfs.so libdmapi.so; do
-		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
-	done
-
-	# The TIVsm-BA postinstall script only does messages and ancient upgrades
-
-	# The gscrypt64 postinstall script only deals with s390[x] SELinux
-	# and the symlink for the iccs library which we handle in the loop below.
-
-	# Move stuff from /usr/local to /opt, #452332
-	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
-	rmdir "${D}"/usr/local || die
-
-	# Mimic gskssl64 postinstall script
-	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
-		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
-			/usr/lib64/libgsk8${i}_64.so
-	done
-	for i in capicmd ver; do
-		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
-	done
-
-	# Done with the postinstall scripts as the RPMs contain them.
-	# Now on to some more Gentoo-specific installation.
-
-	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
-
-	# Avoid "QA Notice: Found an absolute symlink in a library directory"
-	local target
-	find "${D}"usr/lib* -lname '/*' | while read i; do
-		target=$(readlink "${i}")
-		rm -v "${i}" || die
-		dosym "../..${target}" "${i#${D}}"
-	done
-
-	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
-	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
-
-	keepdir /var/log/tsm
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/tsm.logrotate" tsm
-
-	keepdir /etc/tivoli
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
-	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
-
-	# Added the hostname to be more friendly, the admin will need to edit this file anyway
-	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
-	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
-	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
-
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
-	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
-
-	# Setup the env
-	dodir /etc/env.d
-	ENV_FILE="${D}/etc/env.d/80tivoli"
-	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
-	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
-	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
-	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
-
-	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
-	insinto "/etc/revdep-rebuild"
-	doins "${T}/80${PN}"
-
-	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
-	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
-
-	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
-	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
-
-	systemd_dounit "${FILESDIR}/dsmc.service"
-	systemd_dounit "${FILESDIR}/dsmcad.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local i dirs
-	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
-		if [[ ! -e $i ]]; then
-			touch $i || die
-			chown :tsm $i || die
-			chmod 0660 $i || die
-		fi
-	done
-
-	# Bug #375041: the log directory itself should not be world writable.
-	# Have to do this in postinst due to bug #141619
-	chown root:tsm /var/log/tsm || die
-	chmod 0750 /var/log/tsm || die
-
-	# Bug 508052: directories used to be too restrictive, have to widen perms.
-	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
-	chown root:root "${dirs[@]}" || die
-	chmod 0755 "${dirs[@]}" || die
-
-	readme.gentoo_print_elog
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,2 +1,3 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
--- a/app-crypt/acme/acme-0.33.0.ebuild
+++ b/app-crypt/acme/acme-0.33.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,2 +1,3 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
--- a/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,2 +1,3 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
--- a/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.33.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -25,8 +25,8 @@ IUSE=""

 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.33.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,2 +1,3 @@
 DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
+DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
--- a/app-crypt/certbot/certbot-0.33.0.ebuild
+++ b/app-crypt/certbot/certbot-0.33.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@ -42,5 +42,7 @@ DEPEND="
 	)"

 python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
 	pytest -vv ${PN} || die
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@ -1,2 +1,3 @@
+DIST gnome-latex-3.28.1.tar.xz 1082708 BLAKE2B 3b0a341278838b37fb1a54f4f746af4fc6ccf4dd37f6b919f53523acfdcbeb6a8974217260db4d8186b8acd3ba782cbc1ddf1dce20735d70d01c88ed3c1fb90f SHA512 fe5c2456839757237d422d0f0629f11a43a8ca5b3cd86ce94b37ee26f68165f111940d5c3c47adba7be05532c413a97a867219c498abec3fd064122516e0c470
 DIST latexila-3.22.1.tar.xz 1111820 BLAKE2B 8a3e375ba048112565f6b074ec62a243fb34890f6e903a2ba2d36f7bb5ede6b0fcb8b488a725752c2edd06b0c71916f13915ebdc26fcf8b6a889523b99141b10 SHA512 7c2d3b95b9547e97c79f5e6384b1f33ccb81e70cea1d26fcc07845f3f391ac54b5931ddcec742f3439ba55e8f9f2a2054935795ab16bee584eb05780a72ba3a9
 DIST latexila-3.24.3.tar.xz 1112940 BLAKE2B 2410276574f02735dde9ce77a9bba257e3732784664b302870957fc3f8603bedddaebed4da3f6da1e1f6fc30e3dc233146b65dbf7589a8776c653018a4129355 SHA512 c7c8996704e68ed136d3d2a04c839faf5497a78ad459411daaabfba38ac883f253325f07a8c126cc4b2f1d553fe08b39f1d6a51d1b6944540dc13142173e4361
--- a/app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
 VALA_USE_DEPEND="vapigen"
+GNOME_ORG_MODULE="latexila"

 inherit gnome2 vala

 DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"

-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection +latexmk rubber"
--- a/app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
+GNOME_ORG_MODULE="latexila"

 inherit gnome2 vala

 DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"

-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+introspection +latexmk rubber"
--- a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="
+	app-text/enchant:0
+	>=app-text/gspell-1.0:0=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0:4
+	>=gui-libs/tepl-4.0:4
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnome-base/dconf
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-dconf_migration
+}
--- a/app-editors/gnome-latex/metadata.xml
+++ b/app-editors/gnome-latex/metadata.xml
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
@ -26,6 +26,7 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
+	dev-qt/qttest:5
 "

 src_prepare() {
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@ -30,6 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
+	dev-qt/qttest:5
 "

 PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@ -20,6 +20,7 @@ SLOT="0"
 IUSE=""

 RDEPEND="
+	app-i18n/uchardet
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@ -32,6 +33,7 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
+	dev-qt/qttest:5
 "

 src_prepare() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1 +1,2 @@
 DIST diskimage-builder-2.20.3.tar.gz 403533 BLAKE2B 08aba837288123081d53b9f79af55c520acf5120dc7126781764c85aa633884ca812b46cd000f619f36138df34252652ea427dbd73aa215196883046b0baa469 SHA512 efefd3c19643e75794293519286d1df81b8bf88511d394b13addfd8953368f3ff6cd57a884b77a161d0b7d01b97624e4dd91d79497e22058f24747ee4a24df3a
+DIST diskimage-builder-2.21.0.tar.gz 409367 BLAKE2B 25c8a819be8674eee38a97e822151527dd77d3f5e85016ebc1a7fa5bf907f64bdac47012eb748b69273b519580c6ea4ca845abd7800ddb4e3f60dd81da546a73 SHA512 51a871a772fd4ae35d0a8ea51f7c01502c374805f5de5ab37c2f18ea868a829c7085ecaa6a62690e8d6e85afe225cbab7ed86266eb5fc3e8741a8ff968cb35f9
--- a/app-emulation/diskimage-builder/diskimage-builder-2.21.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.21.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@ -57,11 +57,7 @@ RDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
-	|| (
-		>=net-analyzer/gnu-netcat-0.7.1-r3
-		>=net-analyzer/netcat-110-r9
-		>=net-analyzer/openbsd-netcat-1.105-r1
-	)
+	>=net-analyzer/openbsd-netcat-1.105-r1
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc
--- a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
@ -56,11 +56,7 @@ RDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
-	|| (
-		>=net-analyzer/gnu-netcat-0.7.1-r3
-		>=net-analyzer/netcat-110-r9
-		>=net-analyzer/openbsd-netcat-1.105-r1
-	)
+	>=net-analyzer/openbsd-netcat-1.105-r1
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc
--- a/app-emulation/libvirt/libvirt-5.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.1.0.ebuild
@ -56,11 +56,7 @@ RDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
-	|| (
-		>=net-analyzer/gnu-netcat-0.7.1-r3
-		>=net-analyzer/netcat-110-r9
-		>=net-analyzer/openbsd-netcat-1.105-r1
-	)
+	>=net-analyzer/openbsd-netcat-1.105-r1
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -56,11 +56,7 @@ RDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
-	|| (
-		>=net-analyzer/gnu-netcat-0.7.1-r3
-		>=net-analyzer/netcat-110-r9
-		>=net-analyzer/openbsd-netcat-1.105-r1
-	)
+	>=net-analyzer/openbsd-netcat-1.105-r1
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc
--- a/app-emulation/xen-tools/xen-tools-4.12.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild
@ -24,11 +24,10 @@ else
 	# xen-tools's gentoo patches version which apply to this specific ebuild
 	GENTOO_GPV=0
 	# xen-tools ovmf's patches
-	OVMF_VER=3
+	OVMF_VER=

 	SEABIOS_VER=1.12.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56

 	[[ -n ${UPSTREAM_VER} ]] && \
 		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
@ -43,8 +42,7 @@ else

 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
 	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		${OVMF_PATCHSET_URI} )
 	${UPSTREAM_PATCHSET_URI}
 	${SECURITY_PATCHSET_URI}
@ -236,11 +234,12 @@ src_prepare() {
 	if use ovmf; then
 		if [[ -n ${OVMF_VER} ]];then
 			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
 			eapply "${WORKDIR}"/patches-ovmf
 			popd > /dev/null
 		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
 	fi

 	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@ -61,7 +61,7 @@ DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde
 DIST skim-0.5.4.tar.gz 87040 BLAKE2B c7816dae5142d3230bf98db7c86ec8b8d78adac52dfe19c6760d65b6ea81e704f84c4127c9ca1d74812ddef69595290a8f09f01869a41dc17a42a33d2eedb15b SHA512 f21af6c86ca6b1c4aab1b715c1c47ced1d06c45216a03493cfc3f01d7ed6ecb6e287a335d0756f4b82b97d4d22493b01598569a0529bc57983a5a4716427af83
 DIST skim-0.5.5.tar.gz 87411 BLAKE2B 98dbd5d8f5d45a0752975316aa41971622e6d65e91dbfe9c8248882931d05dcfb0d8ab32fc51504060fd41aef7c456c8f753e2939a726ad41cd3b82515adeeb1 SHA512 a6970252633e32004edc4e4cf910a5d07d1a63b11b77e56d5ddc6ad656d33ea984dc02523fbfaf5eeb58c197d95a17fb6bcdf16448d68c6a239798b3180d7aa2
 DIST skim-0.6.4.tar.gz 85922 BLAKE2B ddf8a64bf3e7daca04bea7e0a208b9acf7e336c299ac3e524bff081f55b103b431d8f35790265222d36ba26abe9e0377cf6c748af81739d42fb2a0b82a40f6f7 SHA512 1aaa10158cae58d2fcd0a2c25c03699ef63cf6d2ae94adba5988259c5be23eda5837b22c45643904e96bd095e8ad6efb48c7c36ffb3db14492773e71fe9d66e6
-DIST skim-0.6.5.tar.gz 86494 BLAKE2B 9f83ce6ab095c4838471d3404bed06284290ca2f606efd0288c0536784681ebc136e98eb6e1813ec24ab7e1018da3444f9d3f8cbfefc9ec8493042e0d36ecc7f SHA512 f643cb2a72b1311b9de2955b0a719af4371ea276fb3465935f83844ffdd7cf8362b40c7f4e51f0c085e5b51542a69b6fe99e4864daf357778638706fc112f2a1
+DIST skim-0.6.6.tar.gz 86665 BLAKE2B 5e89507ab76d974bd0925aa273565eae0f9e7783a18a84da6083d28ac13394ace48123cc658bab6065c0fd4f46a2e96469ac990ef58e6a0391e740825095581f SHA512 df4c8c9a3641321786e014f63d1f1bc4b15762d666792d3f8b86e73704c15643ca01e3f6242243eb903454cc7c8e983255583b1cddc39cfdd5e779c00f1a546e
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
--- a/app-misc/skim/skim-0.6.6.ebuild
+++ b/app-misc/skim/skim-0.6.6.ebuild
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@ -1,4 +1,2 @@
-DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b270107f4063b299175f5c08e5e7ace2468e1512a297464fda5695c830808916e6a0dd1202ca7e85b32cfd175d8cc2b18 SHA512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
-DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_P=${P/-gpl}
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET=1
-
-SRC_URI="
-	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
-"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=sys-libs/zlib-1.2.7
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:= )
-	tiff? ( >=media-libs/tiff-4.0.1:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	app-text/poppler-data
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-gtk3.patch" # bug 668160
-)
-
-src_prepare() {
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
-	eapply "${WORKDIR}/patches/"*.patch
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with tiff system-libtiff) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto /usr/share/ghostscript/${PVM}/Resource/Init
-	doins \
-		"${WORKDIR}/fontmaps/CIDFnmap" \
-		"${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use l10n_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib versionator flag-o-matic toolchain-funcs
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_P=${P/-gpl}
-PVM=$(get_version_component_range 1-2)
-PVM_S=$(replace_all_version_separators "" ${PVM})
-
-MY_PATCHSET=1
-
-SRC_URI="
-	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
-"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=sys-libs/zlib-1.2.7:=
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:= )
-	tiff? ( >=media-libs/tiff-4.0.1:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-	!<net-print/cups-filters-1.0.36-r2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-src_prepare() {
-	default
-
-	# remove internal copies of various libraries
-	rm -rf "${S}"/cups/libs || die
-	rm -rf "${S}"/expat || die
-	rm -rf "${S}"/freetype || die
-	rm -rf "${S}"/jbig2dec || die
-	rm -rf "${S}"/jpeg{,xr} || die
-	rm -rf "${S}"/lcms{,2} || die
-	rm -rf "${S}"/libpng || die
-	rm -rf "${S}"/tiff || die
-	rm -rf "${S}"/zlib || die
-	rm -rf "${S}"/openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -rf "${S}"/Resource/CMap || die
-
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
-	eapply "${WORKDIR}/patches/"*.patch
-
-	if ! use gtk ; then
-		sed -i -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			"${S}"/base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -i \
-		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -i \
-		-e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
-
-	cd "${S}" || die
-	# remove incorrect symlink, bug 590384
-	rm -f ijs/ltmain.sh || die
-	eautoreconf
-
-	cd "${S}/ijs" || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with tiff system-libtiff) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd "${S}/ijs" || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto /usr/share/ghostscript/${PVM}/Resource/Init
-	doins \
-		"${WORKDIR}/fontmaps/CIDFnmap" \
-		"${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use l10n_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@ -1,3 +1,3 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
-DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
 DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
+DIST qpdfview-0.4.18_pre4.tar.gz 782305 BLAKE2B 0e79a30e9774a1afb7f38bd932e8e1b2a7930acca217b7ac485f4857211449f5a8f902706b4638023667002d2f98fc116a180b2ec0219a360fe8c3025023cc39 SHA512 24431a27c279c290ce95a7db52f87e6cade0683dab53a3c494823020a7df9150919af31f20f63ff4c7337f5548b3e7252df0d8a6043a8c50ebb18e41f387838d
--- a/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
-
-inherit l10n qmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
-	cups? ( net-print/cups )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	postscript? ( app-text/libspectre )
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dbus? ( dev-qt/qtdbus:5 )
-	pdf? ( >=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5 )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
-	default
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
--- a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -25,7 +25,7 @@ RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
+	dev-qt/qtprintsupport:5[cups?]
 	dev-qt/qtwidgets:5
 	dbus? ( dev-qt/qtdbus:5 )
 	pdf? ( >=app-text/poppler-0.35[qt5]
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/boot-bin/boot-bin-2.7.1.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -10,7 +10,7 @@ MY_PNV="${MY_PN}-${PV}"
 GITHUB_USER="boot-clj"

 DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="http://boot-clj.com/"
+HOMEPAGE="https://boot-clj.com/"
 SRC_URI="
 	https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
 	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
--- a/dev-java/junit/files/junit-3.8.2-build.xml
+++ b/dev-java/junit/files/junit-3.8.2-build.xml
@ -1,90 +0,0 @@
-<?xml version="1.0" ?>
-<!-- JUnit build script using ant 1.4 --><project basedir="." default="dist" name="junit">
-	<property file="${user.home}/.junit.properties"/>
-	<property name="build.compiler" value="classic"/>
-	<property name="version" value="3.8.2"/>
-	<property name="dist" value="junit${version}"/>
-	<property name="versionfile" value="junit/runner/Version.java"/>
-	<property name="zipfile" value="${dist}.zip"/>
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target depends="init" name="versiontag">
-		<filter token="version" value="${version}"/>
-		<copy file="${versionfile}" filtering="on" tofile="${versionfile}tmp"/>
-		<move file="${versionfile}tmp" tofile="${versionfile}"/>
-	</target>
-
-	<target depends="versiontag" name="build">
-		<javac debug="on" destdir="." source="1.3" srcdir="." target="1.3"/>	
-	</target>
-
-	<target depends="build" name="dist">
-		<delete dir="${dist}"/>
-		<mkdir dir="${dist}"/>
-		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html" jarfile="${dist}/src.jar"/>
-		<jar basedir="." excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html" jarfile="${dist}/junit.jar"/>
-		<copy todir="${dist}/junit/samples">
-			<fileset dir="junit/samples"/>
-		</copy>
-		<copy todir="${dist}/junit/tests">
-			<fileset dir="junit/tests"/>
-		</copy>
-
-
-		<delete file="${dist}/junit/tests/runner/test.jar"/> 
-		<jar basedir="." includes="junit/tests/runner/LoadedFromJar.class" jarfile="${dist}/junit/tests/runner/test.jar"/> 
-
-		<copy file="README.html" tofile="${dist}/README.html"/>
-		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html"/>
-		
-		<java classname="junit.textui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="javadoc">
-		<mkdir dir="${dist}/javadoc"/>
-		<javadoc author="false" destdir="${dist}/javadoc" packagenames="junit.framework.*, junit.extensions.*" source="1.3" sourcepath="." use="false" version="false" windowtitle="JUnit API"/>
-		<copy todir="${dist}/doc">
-			<fileset dir="doc"/>
-		</copy>
-	</target>
-	
-	<target depends="dist" name="zip">
-		<zip basedir="." includes="${dist}/**" zipfile="${zipfile}"/>
-	</target>
-	
-	<target depends="dist" name="awtui">
-		<java classname="junit.awtui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-	
-	<target depends="dist" name="swingui">
-		<java classname="junit.swingui.TestRunner" fork="yes">
-			<arg value="junit.samples.AllTests"/>
-			<classpath>
-				<pathelement location="${dist}"/>
-				<pathelement location="${dist}/junit.jar"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean">
-		<delete dir="${dist}" quiet="true"/>			
-		<delete file="${zipfile}" quiet="true"/> 
-		<delete>
-			<fileset dir="${basedir}" includes="**/*.class"/> 
-		</delete>
-	</target>
-</project>
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/polyml/files/polyml-5.6-configure.patch
+++ b/dev-lang/polyml/files/polyml-5.6-configure.patch
@ -0,0 +1,11 @@
+--- a/configure.ac	2019-04-05 10:27:19.026197625 +0200
+++ b/configure.ac	2019-04-05 10:28:10.187291374 +0200
+@@ -133,7 +133,7 @@
+ # Solaris needs -lsocket, -lnsl and -lrt
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([getsockopt], [socket])
+-AC_SEARCH_LIBS([sem_wait], [rt])
+AC_SEARCH_LIBS([sem_wait], [rt] [pthread])
+ 
+ # Check for X and Motif headers and libraries
+ AC_PATH_X
--- a/dev-lang/polyml/polyml-5.6.ebuild
+++ b/dev-lang/polyml/polyml-5.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -20,6 +20,8 @@ RDEPEND="X? ( x11-libs/motif:0 )
 		virtual/libffi"
 DEPEND="${RDEPEND}"

+PATCHES=( "${FILESDIR}"/${P}-configure.patch )
+
 src_prepare() {
 	default
 	eautoreconf
--- a/dev-lang/vala/vala-0.36.18.ebuild
+++ b/dev-lang/vala/vala-0.36.18.ebuild
@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

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

 RDEPEND="
--- a/dev-lang/vala/vala-0.40.14.ebuild
+++ b/dev-lang/vala/vala-0.40.14.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test valadoc"

 RDEPEND="
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@ -1,3 +1,4 @@
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
+DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
--- a/dev-libs/apr/apr-1.7.0.ebuild
+++ b/dev-libs/apr/apr-1.7.0.ebuild
@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="5"
+EAPI="7"

 inherit eutils multilib-minimal

 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-r3
+	EGIT_REPO_URI="https://repo.or.cz/cloog.git"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
@ -29,6 +29,8 @@ DEPEND="${DEPEND}
 DOCS=( README )

 src_prepare() {
+	default
+
 	if [[ ${PV} == "9999" ]] ; then
 		./get_submodules.sh
 		eautoreconf -i
@ -58,5 +60,5 @@ multilib_src_test () {

 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -type f -name '*.la' -delete
 }
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@ -21,15 +21,9 @@ DEPEND="${RDEPEND}

 DOCS=( ChangeLog AUTHORS doc/manual.pdf )

-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+)

 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@ -1 +1,2 @@
 DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
+DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661
--- a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
+++ b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
@ -0,0 +1,16 @@
+diff --git a/Makefile b/src/Makefile
+index 35b4818..c034531 100644
+--- a/Makefile
+++ b/Makefile
+@@ -36,7 +36,10 @@ OBJDIR ?= .
+ OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
+ 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
+
+-LIBS := $(OBJDIR)/libbpf.a
+ifdef BUILD_STATIC
+	LIBS := $(OBJDIR)/libbpf.a
+endif
+
+ ifndef BUILD_STATIC_ONLY
+ 	LIBS += $(OBJDIR)/libbpf.so \
+ 		$(OBJDIR)/libbpf.so.$(VERSION) \
--- a/dev-libs/libbpf/libbpf-0.20190404.ebuild
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="7c27c6306160f630c3c4f4b4971deb657126d681"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.20190404-makefile.patch"
+)
+
+src_prepare() {
+	# upstream doesn't provide a pkgconfig file, so
+	# let's make one
+	printf 'prefix=/usr\nexec_prefix=${prefix}\nlibdir=%s\n' \
+			"/usr/$(get_libdir)" \
+		> ${PN}.pc
+	printf 'includedir=${prefix}/include\n\n' \
+		>> ${PN}.pc
+
+	printf 'Name: %s\nDescription: %s\nVersion: %s\nLibs: -lbpf %s\n' \
+			"${PN}" \
+			"${DESCRIPTION}" \
+			"${PV}" \
+			"$($(tc-getPKG_CONFIG) --libs libelf)" \
+		>> ${PN}.pc
+
+	default
+}
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
--- a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.0.7"
+KEYWORDS=""
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@ -1,4 +1 @@
-DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
-DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
-DIST libmspack-0.8alpha.tar.gz 488869 BLAKE2B 346609f86e1668f012794c89704991d9e1c206f73f47febcc6c32b6523819f00bf13aeafb250611b73ab8eb25764a6ada0cecaf138452ece64674784aeaeaedd SHA512 d178afc4d2eded204594c81af1c91be17d3be4f1a09829e08c103023aa7badc6b2595e9ec13cc7f77e3262d2cd874ed40ce6da01695c5c839682562740d2bf0a
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-RDEPEND="
-	utils? ( !app-arch/mscompress )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-tests.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	prune_libtool_files --all
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED}"/usr/bin/* || die
-	fi
-}
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-RDEPEND="
-	utils? ( !app-arch/mscompress )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-parallel-build.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED%/}"/usr/bin/* || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
--- a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-RDEPEND="
-	utils? ( !app-arch/mscompress )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED%/}"/usr/bin/* || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
--- a/dev-libs/libmspack/metadata.xml
+++ b/dev-libs/libmspack/metadata.xml
@ -5,7 +5,4 @@
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
-	<use>
-		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
-	</use>
 </pkgmetadata>
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
 inherit autotools eutils

 DESCRIPTION="Small library to access XDG Base Directories Specification paths"
-HOMEPAGE="http://repo.or.cz/w/libxdg-basedir.git"
-SRC_URI="https://github.com/devnev/${PN}/archive/${P}.tar.gz"
+HOMEPAGE="https://github.com/devnev/libxdg-basedir"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
+++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
@ -0,0 +1,23 @@
+From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Tue, 2 Apr 2019 15:26:06 +0200
+Subject: [PATCH] mbedtls: link against the correct library
+
+Inspired by https://github.com/nih-at/libzip/pull/88
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f252b3f7..f8eb16eeb 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ ELSE()
+ ENDIF()
+ IF(ENABLE_MBEDTLS)
+   FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
+-  FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls)
+  FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
+ ELSE()
+   SET(MBEDTLS_LIBRARIES FALSE)
+ ENDIF()
--- a/dev-libs/libzip/libzip-1.5.2-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild
@ -30,6 +30,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820
+
 pkg_setup() {
 	# Upstream doesn't support building dynamic & static
 	# simultaneously: https://github.com/nih-at/libzip/issues/76
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"

 RDEPEND="zlib? ( sys-libs/zlib )
--- a/dev-libs/polylib/polylib-9999.ebuild
+++ b/dev-libs/polylib/polylib-9999.ebuild
@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 inherit autotools git-r3

-EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-	http://repo.or.cz/r/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"

 DESCRIPTION="ppl port of cloog"
 HOMEPAGE="http://icps.u-strasbg.fr/polylib/"
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""

 # Previously ${PN} was part of dev-lang/vala
--- a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
@ -16,13 +16,13 @@ IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"

-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+	>=dev-libs/libxslt-1.0.20:=
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
 	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
+		>=dev-libs/nspr-4.4.1:=
+		>=dev-libs/nss-3.9:=
 	)
 	openssl? (
 		!libressl? ( dev-libs/openssl:0= )
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@ -1 +1,2 @@
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
+DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/PyECLib/"
+SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
+S="${WORKDIR}/pyeclib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-libs/jerasure"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="dev-libs/liberasurecode
+	${CDEPEND}"
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@ -1,3 +1,2 @@
-DIST bpython-0.16.tar.gz 201898 BLAKE2B 907f6a506d2b52db01e7b84c615574a7daad36f630646a345c963e432cc394330339390b6afc2585845b19d6c00d9c0b95e06b9d3b0fe85fe20daad3f5cf208a SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b
 DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
-DIST bpython-0.17.tar.gz 214230 BLAKE2B dc26de037eb5698c04afb74472fe9483e1398f4f40b7da21520f2e7e2ba6e510bcbf200938d520d95b976a6fbeb31af7b1b1f828a022835edbe40d381c82797d SHA512 17c25f4ed69eb7cff27ba0a488434623a7105c60bbf1e6f608c91babf240741ab7a7097ad347f897cd5f39f2fedb944fd69d8dbfbc66da6b910e1a14ace6fd1f
+DIST bpython-0.18.tar.gz 213321 BLAKE2B 476c18fbec1d4ef3c5e206e7586b0e982656160474b64ceaecf5b49f560115af0e51d964553aad25bc765f7b431bc4f062581f9f30c0cb2e8da51cdbf2bca5ca SHA512 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab
--- a/dev-python/bpython/bpython-0.16-r1.ebuild
+++ b/dev-python/bpython/bpython-0.16-r1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/bpython/bpython-0.16.ebuild
+++ b/dev-python/bpython/bpython-0.16.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.10[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/bpython/bpython-0.18.ebuild
+++ b/dev-python/bpython/bpython-0.18.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -36,6 +36,8 @@ DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
 # Req'd for clean build by each impl
 DISTUTILS_IN_SOURCE_BUILD=1

+RESTRICT="test" #659110
+
 python_compile_all() {
 	if use doc; then
 		sphinx-build -b html -c doc/sphinx/source/ \
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@ -0,0 +1 @@
+DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Full featured redis cache backend for Django."
+HOMEPAGE="https://github.com/niwinz/django-redis"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/django-redis/metadata.xml
+++ b/dev-python/django-redis/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 BDEPEND="
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@ -1,2 +1,3 @@
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
+DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@ -1,3 +1,2 @@
-DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
-DIST pymediainfo-3.0.tar.gz 425428 BLAKE2B b56fa94f41096aff143d57c8f4175ce251d270e1d94f8464800eea2c4a5a952a466b962c646b0449d81ce2dd394c7bab1293eb358a33742631e51aead49e893b SHA512 b6828065f8d4907e94a299e4b3d550b1aad6dfa335b5eaae73e51a9b9052a8c494960b95473b49c10bb4407d3f48db07c2457b2937464317d64997c380571bcd
 DIST pymediainfo-3.1.tar.gz 430689 BLAKE2B 2abb8197ab8890617cb0cebf15001fefc5837c886c110f66852be56db6a2df851ec13b7dc76db40723cc920bf44ca87286446f451dc5c51b8998ee332a23cad8 SHA512 a2fd04977236190c18e62da9ec0110d9de9f31acaae448b40ce56f66d925d9e0e0d2015f7824d359ebbd8ec749c0ff812ee4ef776333319827759c4c4fe708ab
+DIST pymediainfo-4.0.tar.gz 432284 BLAKE2B 1159f48f28f0a3473327830e56a27fcd14dc9d9dceeac6f90d52a048229d87e97d3b88ef865eefe454c8cebf55148981b2e88127e863682e00992d56c2906048 SHA512 988f0d8a212bc5893925bd96a5b41a1a2c8e9508c747e7aa1106f3a065ad5707a7ed9de71264d74ba6637a2b8efbdeeed3677d779167bb90f643d40f81c5a74e
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libmediainfo
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# requires network access
-	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/pymediainfo/pymediainfo-4.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@ -1,3 +1,4 @@
 DIST redis-py-2.10.5.tar.gz 88610 BLAKE2B 092efe4fcbc500a59981fc2d8574b70ee322ce7ccba012e5babd022f30abb017e53f093b3f4d876a297ab2e4403a57e749582d4027f1efa53efcbab0214347b7 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f
 DIST redis-py-2.10.6.tar.gz 97299 BLAKE2B 9fea87b5c8ae0f3574651717e664cda62ca7752e44c4e60f4a50b82b53a52a5d005dc79c72afa58abfb807bf303f46335761129c54a2ef8e4f524451543c6c96 SHA512 e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad
 DIST redis-py-2.9.1.tar.gz 62204 BLAKE2B 633dd00d5aa984ac4dfb223aa685f8fa6913f4f00bb5c5c231dc77b6e8d33f1cd57c2e2bc07c4ec4658ca3b7675fd172919187fa2e95afb8eb5345f65dcbca00 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38
+DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08
--- a/dev-python/redis-py/redis-py-3.2.1.ebuild
+++ b/dev-python/redis-py/redis-py-3.2.1.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed -e 's:from .conftest:from conftest:' \
+		-i tests-hidden/{test_commands.py,test_connection_pool.py,test_encoding.py,test_lock.py,test_pubsub.py} \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@ -2,3 +2,4 @@ DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
 DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
 DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
+DIST setuptools-40.9.0.zip 847572 BLAKE2B 1ef3f05d747a67395f705ad46bf066f400c9a5ad97efe73175e72eb9091c929cb61a526da1206f431a4e054939e0fd2b2a841a892c6cc76a6116cf781112b472 SHA512 2d278ef162139dfb1dd3640154ae3db755ff5c2285810c85b0452d12e3f3cb199e3f1a1ec7cc43a377d42cd4f86e97e2c773d9f0a3bef8dc1acbf31e6f61033f
--- a/dev-python/setuptools/setuptools-40.9.0.ebuild
+++ b/dev-python/setuptools/setuptools-40.9.0.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-4
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690`