diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0a80eb798a2e..4b938527a9bb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4d40512591fb..d873ba4b5dbe 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index f93e9e38e609..d246569598d6 100644
--- 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
diff --git a/app-admin/ansible/ansible-2.6.16.ebuild b/app-admin/ansible/ansible-2.6.16.ebuild
new file mode 100644
index 000000000000..4bec3453ac7f
--- /dev/null
+++ 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
+}
diff --git a/app-admin/ansible/ansible-2.7.10.ebuild b/app-admin/ansible/ansible-2.7.10.ebuild
new file mode 100644
index 000000000000..1363dee05e63
--- /dev/null
+++ 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
+}
diff --git a/app-admin/helm/files/helm-2.12.0-sorting.patch b/app-admin/helm/files/helm-2.12.0-sorting.patch
deleted file mode 100644
index 560768049fde..000000000000
--- a/app-admin/helm/files/helm-2.12.0-sorting.patch
+++ /dev/null
@@ -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)
-+			}
-+		})
-+	}
-+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 06d05b6bb638..5e459ec07185 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git 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
deleted file mode 100644
index 18673419a584..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
+++ /dev/null
@@ -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;
- }
- 
diff --git 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
deleted file mode 100644
index 5585ea614534..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
+++ /dev/null
@@ -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;
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index d979c2b66e34..251b86adfc38 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index b35b13df6d70..6fcba5100fe5 100644
--- 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
diff --git a/app-backup/tsm/tsm-7.1.4.4-r3.ebuild b/app-backup/tsm/tsm-7.1.4.4-r3.ebuild
deleted file mode 100644
index ef3867988c28..000000000000
--- a/app-backup/tsm/tsm-7.1.4.4-r3.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c6619d15c7f8..b490673c0970 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 2bb930b04665..7e612162e2a7 100644
--- 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
diff --git a/app-crypt/acme/acme-0.33.0.ebuild b/app-crypt/acme/acme-0.33.0.ebuild
new file mode 100644
index 000000000000..8a9d37f4aec6
--- /dev/null
+++ 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
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2bb930b04665..7e612162e2a7 100644
--- 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
diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
new file mode 100644
index 000000000000..b6c158fb2f52
--- /dev/null
+++ 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
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 2bb930b04665..7e612162e2a7 100644
--- 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
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
new file mode 100644
index 000000000000..9adf3132423f
--- /dev/null
+++ 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}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index b3315cd42643..9adf3132423f 100644
--- 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}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 2bb930b04665..7e612162e2a7 100644
--- 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
diff --git a/app-crypt/certbot/certbot-0.33.0.ebuild b/app-crypt/certbot/certbot-0.33.0.ebuild
new file mode 100644
index 000000000000..48d3f1039d4c
--- /dev/null
+++ 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
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 1c019d37388a..48d3f1039d4c 100644
--- 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
 }
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fe670309f716..48041b7b7e9e 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/latexila/Manifest b/app-editors/gnome-latex/Manifest
similarity index 66%
rename from app-editors/latexila/Manifest
rename to app-editors/gnome-latex/Manifest
index 87ee392b60b3..6d5a8d9ec348 100644
--- a/app-editors/latexila/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
diff --git a/app-editors/latexila/latexila-3.22.1.ebuild b/app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
similarity index 88%
rename from app-editors/latexila/latexila-3.22.1.ebuild
rename to app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
index 14c5f696a25a..fbc83e2fa71a 100644
--- a/app-editors/latexila/latexila-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"
diff --git a/app-editors/latexila/latexila-3.24.3.ebuild b/app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
similarity index 88%
rename from app-editors/latexila/latexila-3.24.3.ebuild
rename to app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
index 6f814770cacf..5424ce2ac3f2 100644
--- a/app-editors/latexila/latexila-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"
diff --git a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
new file mode 100644
index 000000000000..67673e7585d8
--- /dev/null
+++ 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
+}
diff --git a/app-editors/latexila/metadata.xml b/app-editors/gnome-latex/metadata.xml
similarity index 100%
rename from app-editors/latexila/metadata.xml
rename to app-editors/gnome-latex/metadata.xml
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
index ad4de06fd0d8..fbdfbecdd1d7 100644
--- 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() {
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index 810b3dd47740..804533a3e34b 100644
--- 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 )
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 040e2d2a99b4..f906b948b04b 100644
--- 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() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 16c4cb509dd0..c666f7336c14 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index f699aa26fb71..a1977ce249e9 100644
--- 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
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.21.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.21.0.ebuild
new file mode 100644
index 000000000000..4c5588077dbd
--- /dev/null
+++ 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}]"
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index 5d4906ba113c..95b5a3438d7a 100644
--- 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
diff --git a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
index f5e5d7d5ddef..dd115c7a957b 100644
--- 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
diff --git a/app-emulation/libvirt/libvirt-5.1.0.ebuild b/app-emulation/libvirt/libvirt-5.1.0.ebuild
index 1f96bf5f51a7..d0b9652fb37a 100644
--- 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
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7d5151b6d96b..39626cb3fae9 100644
--- 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
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0.ebuild
index 6b2195b87b87..f68edb0a8ddf 100644
--- 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
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9d171d75b77..dff3fac93fc0 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index ba554c688759..22a8d7243a6c 100644
--- 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
diff --git a/app-misc/skim/skim-0.6.5.ebuild b/app-misc/skim/skim-0.6.6.ebuild
similarity index 100%
rename from app-misc/skim/skim-0.6.5.ebuild
rename to app-misc/skim/skim-0.6.6.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 984e435086f7..86c888cf6e41 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 985436cf4f55..0c90c42ed8e5 100644
--- 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
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
deleted file mode 100644
index 29eea9194c57..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
deleted file mode 100644
index 5aabd4e86a3a..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index dc2d4feb8eec..ea1c426859c8 100644
--- 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
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
deleted file mode 100644
index b9dbaeb26ae5..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre3.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
similarity index 97%
rename from app-text/qpdfview/qpdfview-0.4.18_pre3.ebuild
rename to app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
index 21f9544f85ee..47d005b062d9 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_pre3.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]
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 90bebff52d93..870f3a8f8112 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
index 91fe6b68b918..8e700cc2e66e 100644
--- 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
diff --git a/dev-java/junit/files/junit-3.8.2-build.xml b/dev-java/junit/files/junit-3.8.2-build.xml
deleted file mode 100644
index 4e47d949bdaf..000000000000
--- a/dev-java/junit/files/junit-3.8.2-build.xml
+++ /dev/null
@@ -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>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 11591cbf9504..44d98c2af8ea 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/polyml/files/polyml-5.6-configure.patch b/dev-lang/polyml/files/polyml-5.6-configure.patch
new file mode 100644
index 000000000000..ba3b6bbbd5ac
--- /dev/null
+++ 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
diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild
index 6cdf4fdd6fb5..1182c2d0766c 100644
--- 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
diff --git a/dev-lang/vala/vala-0.36.18.ebuild b/dev-lang/vala/vala-0.36.18.ebuild
index 2fccf96defc8..a7ea07745c17 100644
--- 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="
diff --git a/dev-lang/vala/vala-0.40.14.ebuild b/dev-lang/vala/vala-0.40.14.ebuild
index dc1447fd35ea..0a843dd941c4 100644
--- 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="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 951d55615430..d2a40fb27fde 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 67aab0480ef5..e664da23c52b 100644
--- 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
diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0.ebuild
new file mode 100644
index 000000000000..1a7fe29b7a21
--- /dev/null
+++ 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
+}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 85781b4d72c3..44fb3bc55495 100644
--- 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
 }
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index 593ac2f4e212..b3e801e7fc30 100644
--- 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)
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 27e7e9bf4c98..eed781dd6e09 100644
--- 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
diff --git a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
new file mode 100644
index 000000000000..7bfe5eb6335f
--- /dev/null
+++ 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) \
diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
new file mode 100644
index 000000000000..2ffb199b195b
--- /dev/null
+++ 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
+}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
new file mode 100644
index 000000000000..22ef31d40939
--- /dev/null
+++ 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
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index b30d47a2ead5..fa7a18545ea5 100644
--- 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
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
deleted file mode 100644
index d7c6bfb768c0..000000000000
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
deleted file mode 100644
index 4a10f2105900..000000000000
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild b/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
deleted file mode 100644
index 79a9df1e7940..000000000000
--- a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
index 1e5806295c83..613d45e5ffa8 100644
--- 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>
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 26e6d732db0b..96a53b458718 100644
--- 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"
diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
new file mode 100644
index 000000000000..564cc9b79f1d
--- /dev/null
+++ 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()
diff --git a/dev-libs/libzip/libzip-1.5.2-r1.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild
index 795775cb0b0d..814a668c4300 100644
--- 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
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index dff2daa814ce..70d56a99baa9 100644
--- 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 )
diff --git a/dev-libs/polylib/polylib-9999.ebuild b/dev-libs/polylib/polylib-9999.ebuild
index 030fb2d71957..dabb9d8742d9 100644
--- 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/"
diff --git a/dev-libs/vala-common/vala-common-0.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index 78497b7207f5..7d1d8d71e51f 100644
--- 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
diff --git a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
index e538a9b24f5a..856125079412 100644
--- 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= )
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f51d7bd27213..6608bdf5f6d8 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 2c9b700b66f7..907335f12e4b 100644
--- 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
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
new file mode 100644
index 000000000000..ab29e70bcb74
--- /dev/null
+++ 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}"
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 55bb645faa62..befb2be97ec7 100644
--- 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
diff --git a/dev-python/bpython/bpython-0.16-r1.ebuild b/dev-python/bpython/bpython-0.16-r1.ebuild
deleted file mode 100644
index 70407a76fccd..000000000000
--- a/dev-python/bpython/bpython-0.16-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-python/bpython/bpython-0.16.ebuild b/dev-python/bpython/bpython-0.16.ebuild
deleted file mode 100644
index 35036333262e..000000000000
--- a/dev-python/bpython/bpython-0.16.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-python/bpython/bpython-0.17.ebuild b/dev-python/bpython/bpython-0.18.ebuild
similarity index 95%
rename from dev-python/bpython/bpython-0.17.ebuild
rename to dev-python/bpython/bpython-0.18.ebuild
index 5c37145681cb..f93dc731b5ac 100644
--- a/dev-python/bpython/bpython-0.17.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/ \
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
new file mode 100644
index 000000000000..57ff3e1cacd6
--- /dev/null
+++ b/dev-python/django-redis/Manifest
@@ -0,0 +1 @@
+DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
new file mode 100644
index 000000000000..982a5193340e
--- /dev/null
+++ 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}"
diff --git a/dev-python/django-redis/metadata.xml b/dev-python/django-redis/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ 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>
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index a82e69d44141..f72f804eea6b 100644
--- 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="
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 3ad3871db3fb..cde5412471fe 100644
--- 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
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
new file mode 100644
index 000000000000..4474c7bf0051
--- /dev/null
+++ 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())'
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index e3caf135c29e..2d0e0d32e573 100644
--- 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
diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
deleted file mode 100644
index ffd76f0cf136..000000000000
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-python/pymediainfo/pymediainfo-3.0.ebuild b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
similarity index 96%
rename from dev-python/pymediainfo/pymediainfo-3.0.ebuild
rename to dev-python/pymediainfo/pymediainfo-4.0.ebuild
index ea072cab56c1..6ea542796361 100644
--- a/dev-python/pymediainfo/pymediainfo-3.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
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index deb2e8bfc3c1..b4c32c2d78cc 100644
--- 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
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
new file mode 100644
index 000000000000..fd8436a7c944
--- /dev/null
+++ 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")
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index bacd94767ead..2753b15de41c 100644
--- 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
diff --git a/dev-python/setuptools/setuptools-40.9.0.ebuild b/dev-python/setuptools/setuptools-40.9.0.ebuild
new file mode 100644
index 000000000000..12cde2b702cb
--- /dev/null
+++ 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
+}
diff --git 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
index 4b8586b5da16..932ca90a05ca 100644
--- 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}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1aa52bb498ff..d2c50b024bd8 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 318873386520..cb62bc45020f 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -2,3 +2,4 @@ DIST regexp_parser-0.4.13.tar.gz 81658 BLAKE2B 008b5c2ab7b08a23c18f165de2028fab7
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
 DIST regexp_parser-1.2.0.tar.gz 82333 BLAKE2B 9748e69c876365f8ef9431dd14168e2759312e51145d856043cd36a7198a68ea08ad31e120aab76ed64a615d776c3ac20e269fc62915fb3ef472438eb90fd440 SHA512 4f47a12e420ecefcc167ff9655b4df97c4a06de4e0ac6479d3595fe1d89b142dc6a64d34b9f4401da9f06119e71fde19d46db7c7e28c4eb0ab5df2e293a36cea
 DIST regexp_parser-1.3.0.tar.gz 82564 BLAKE2B 4b35174893fe3af4d4c2f65625c8920ed4fa5b081868ecfdd418af5bd24749e123c27f26201caa7a792cc3abd89bd826ac332ad042731a330fbf3b05052c14fa SHA512 e2947d32bb8f81fab2428c92ca03389a6df963c4bc2104f9cb9bf013616efc5fdbef711e87d6ff15e2d3a5bc667b1a8c9fc643672975fa23b6e700b2a090c536
+DIST regexp_parser-1.4.0.tar.gz 82874 BLAKE2B b758f5c16c163d43fbf856af20ac6146e9fa81b2945fe7bed8ce66bb3f46586ca03d680a98ea3c2a2deab825adf5d7589856c666b763dc9e688e37e555bbeb1f SHA512 0d350df94cce0812e721d9b2d3b3dc2f5fdadf87eda3824e05121cbb6aceea9b99783bba771af74d9b5606e99e64e23af13abfb000f925440095d612b579c8b3
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild
new file mode 100644
index 000000000000..c7be5088b5dd
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake test? ( dev-ruby/regexp_property_values )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib bin/test || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index cc7245729892..d489fc29e717 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/racket/racket-7.0.ebuild b/dev-scheme/racket/racket-7.0.ebuild
index c3b288258ac4..a24d86837aec 100644
--- a/dev-scheme/racket/racket-7.0.ebuild
+++ b/dev-scheme/racket/racket-7.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit pax-utils
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="http://racket-lang.org/"
-SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+HOMEPAGE="https://racket-lang.org/"
+SRC_URI="minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
diff --git a/dev-scheme/racket/racket-7.1.ebuild b/dev-scheme/racket/racket-7.1.ebuild
index 09fe5c280f4b..2ce724a31c49 100644
--- a/dev-scheme/racket/racket-7.1.ebuild
+++ b/dev-scheme/racket/racket-7.1.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit pax-utils
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="http://racket-lang.org/"
-SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+HOMEPAGE="https://racket-lang.org/"
+SRC_URI="minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5a3d560b73e2..0e4026ac2bdb 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index acfcd0990c75..8de2b193c8eb 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,3 +1,4 @@
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
+DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch
new file mode 100644
index 000000000000..f6aeb428974d
--- /dev/null
+++ b/dev-util/ninja/files/ninja-1.9.0-musl.patch
@@ -0,0 +1,39 @@
+From 567815df38a2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
+From: makepost <makepost@firemail.cc>
+Date: Mon, 24 Dec 2018 03:13:16 +0200
+Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
+
+In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
+compatibility macro. Should help avoid hardcoding platform detection.
+---
+ src/disk_interface.cc | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk_interface.cc b/src/disk_interface.cc
+index d4c2fb087..dc297c449 100644
+--- a/src/disk_interface.cc
++++ b/src/disk_interface.cc
+@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+   // that it doesn't exist.
+   if (st.st_mtime == 0)
+     return 1;
+-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
++#if defined(_AIX)
++  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
++#elif defined(__APPLE__)
+   return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
+           st.st_mtimespec.tv_nsec);
+-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
+-       defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
+-  // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
+-  // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
+-  // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
+-  // For bionic, C and POSIX API is always enabled.
+-  // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
++#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
+   return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
+-#elif defined(_AIX)
+-  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
+ #else
+   return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
+ #endif
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
new file mode 100644
index 000000000000..4bc01a90da3c
--- /dev/null
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/ninja-1.9.0-musl.patch"
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 0f378c4dd3aa..bd7bd0ad6edf 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
@@ -41,15 +44,17 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+"
 
 run_for_build() {
 	if tc-is-cross-compiler; then
 		local -x AR=$(tc-getBUILD_AR)
 		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
 		local -x LDFLAGS=${BUILD_LDFLAGS}
 	fi
+	echo "$@" >&2
 	"$@"
 }
 
@@ -59,7 +64,7 @@ src_compile() {
 	# configure.py uses CFLAGS instead of CXXFLAGS
 	export CFLAGS=${CXXFLAGS}
 
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
 	if tc-is-cross-compiler; then
 		mv ninja ninja-build || die
@@ -82,7 +87,7 @@ src_test() {
 	if ! tc-is-cross-compiler; then
 		# Bug 485772
 		ulimit -n 2048
-		./ninja-build -v ninja_test || die
+		./ninja -v ninja_test || die
 		./ninja_test || die
 	fi
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 6659b13ea5eb..de8aa9cf7b32 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,3 +1,4 @@
 DIST pycharm-community-2018.3.4.tar.gz 310736836 BLAKE2B 2d43955b4d4299026c3fccd00c42e71b98c314d33857b1f81a84f365efde4b89d29b8c20826a3f89b6dc36fb293d867874edc75d68f5070516a27ccb68034cd2 SHA512 35b133b0db3b7fdbc4f08d0070de5aec8b3f170657c932e5c5c0af2e8c4be8b9e408558a0595794acd73e2ef5085295929b2a11013e6e72b852fead4ce572f60
 DIST pycharm-community-2018.3.5.tar.gz 311914955 BLAKE2B d4e1e2cc19a416d7f5ecc1ee181c0b6a4e29ee3577800f2426ec84a7a16f53992526b1df8e3ccd43ccbdeeb7f6521d579fad41d145ecfd24408d2d18b9b577d6 SHA512 a81c95397388b243a5b548e2b4bc54f1be3fdedd191c33a90f57a53002d90eb462d5fbc69b2fa88ccb35d8521cd1224e4491928e4c1810a2e7429a6ba6050d36
+DIST pycharm-community-2019.1.1.tar.gz 332489780 BLAKE2B 2cc7dcbab5fa321e423991622b4e7c9e41c184312a4b3c3a8b900b1ea2436d9f6009e26ffca12f3335be8bb520941c6ac6b579f3e6f2fc0f1b148a9a00ab1868 SHA512 28d7a3353bec271f0a57bea3c44fc788a5b3a5215dff737ba293c2ce73509d06b217ee1615901c91e5895d61a58a2b696c50ae760b6b3a88b472f3746f28bcbf
 DIST pycharm-community-2019.1.tar.gz 330592651 BLAKE2B 4165a1bd9cd63e70b9f982bca4324b2aa1db32bc73bf30e521ed5921eb4b03ffe98004d16600c1795cc974d5188c24a17c988c6b37a90a5d038b0492a692275a SHA512 aa411f7354c7954d22e51246349b66a13cf0544a00ee92945ceb072f3636a020b0ee812a84d49c74e2121561af4f96e9fb6f7b26f69bc473c15ed15614fd16ab
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
index 476b12dea206..3bd1b2cb4101 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
+	dev-libs/libdbusmenu
+	dev-python/pip"
 
 RESTRICT="mirror strip"
 
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 79a08c71685a..76399385ad08 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,3 +1,4 @@
 DIST pycharm-professional-2018.3.4.tar.gz 398325518 BLAKE2B 27ff339d2e8e3db0c94f7a1d8d9e1c740380f62d4b132dc37afb2e1cb4b6ccacdaf29e6caaf25aebd25e650c7a4d1a089b74b3cf1ee8d492722604b11644467a SHA512 34f2461e0af1c18364e7414fe4f92fc34b1c82e17dd2db0c46b812909febb30e9aff26c1c363072f36facb6bbd6d186497fc02b6a7916c808dded63fc7350696
 DIST pycharm-professional-2018.3.5.tar.gz 398296895 BLAKE2B 281fb2c28e556a98e90be37e82fc39d5ed3d50416f1bb519b1a9273880e952faa5a3a85eb1b90928ccb4ad45684fa9be715788ae412b74b4ac287b45bf5458a4 SHA512 2d84368d3058856024f289084d506d92711a369b79d582b9c53b6941514e3089604bac8dc9c5be0a7d15b483bd74e4e1cf2d60cb5f61e3c9755a98091003f42d
+DIST pycharm-professional-2019.1.1.tar.gz 433810320 BLAKE2B baba76f893ca92990241de495f0a00029a135b890aeca067fdb699ffc6f4e7042487ada452f7fb793731b0ec303f0e73baf2c76da8e0821edcf195c210958b74 SHA512 d4419fbef02e3c8a6c3820da56f089a5630ac2c94dc701854f0ea03a5797f7489db6613a8426cf89a4c6c5259b44d589846b04e36051e44641845a32d81b368e
 DIST pycharm-professional-2019.1.tar.gz 431555873 BLAKE2B c222d81a342055111455b749100392b17409c998d539bb3d64d4d51d155df07062f05057194c79da9ccaf00888e0238731f94651fbae8e92d11ae6fd8e5d3f6d SHA512 20b60f9c97cf3e8b31534c79775a2cff4a9a1281faa75cc7eb236f860a315b0c1d232356b648778499ebc5ab49cc737911a7e1d316d6f375d865ee9e5042b7f3
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
index 4b028da13f8f..9196130c9fd9 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
 	dev-python/pip"
 
 RESTRICT="mirror strip"
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 41fe766351cf..8f4494604afd 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,2 @@
-DIST radare2-3.1.3.tar.gz 6662694 BLAKE2B bb4cec7fd05e4d43473ef2e67e8284c4b6a856ca1ef312153fbb236b800ed3e369ac9833d87e00e2aa5a560c7d8f7f9433d4b8aa9a3f01e7fabe3c26c3f3d60e SHA512 75b4966e8d64ffd341c50b22d12653e4ead23352d25a7a1f923ee6cb177bd0a9a16e7c02cbd5b58cf3da03f415168606cd67ed19f594dca75c66114e9c35903f
-DIST radare2-3.2.0.tar.gz 6690470 BLAKE2B edfa7d03d72ab3b7ebda6a2c860165c0c53836f4141674581c0f5f5cc1d6dc7a4ea48530d4825342268e057aeca458a0883f6fd70fb4a2d5d052634f32555442 SHA512 9773068568cf71797b0c86837188604130ef9d63e7b7fd115820d8979dde37d259aaea45002c9984e8c3599e9bade53720d3bb1b3635bdad5a2dc73aff54f048
-DIST radare2-3.2.1.tar.gz 6690320 BLAKE2B b0c7db6741d463055d054add112a67378f9f2fae34fabd2848bfffebd44308d0e6fefefa6dd7383ad1b508daed8f388a1538debbf0ae4289130b9c06bfd3f3ae SHA512 4f8c64eb02a80ae5e7adce1322d16f08a250be21c674a8f6f0271bfdc8dc41a6f4ef50fef36e012733db5008cffb356489beef9e9b82300372350bef81e13afa
 DIST radare2-3.3.0.tar.gz 6730482 BLAKE2B c6e5ad73d9e34986ba86b73e8410d45c3f99f89a567de85ae22314fd120f358db39a5f8ac9d64af027eb5c7223564d003865f2c8be6ee0a331936e46d02145d8 SHA512 4db9d547b72b952babfd67c8cef2b94fdac9d6fd1194fb50b2ebab538d5bbda0bab4b704d5af64ef684ce9311634c8e04465906a1e7e706b211427054fe0721a
+DIST radare2-3.4.1.tar.gz 7034801 BLAKE2B 7747af8e51c1120ef683884950e0e9e7581627906487449c81decd25b4d4a8ee5222892c42ba66d1a1d0b373b71ee6bf967df6ef117d30b171cf31740ac3058b SHA512 8803d54a8158aedd5900792bd013dad440a14abbb6fcbdf963e5d9031f30e66865479f29877e6f656ab01b59b3138458daf52f1eaeb462ec767c128d0b12640a
diff --git a/dev-util/radare2/radare2-3.1.3.ebuild b/dev-util/radare2/radare2-3.1.3.ebuild
deleted file mode 100644
index ccba9bfa0ed9..000000000000
--- a/dev-util/radare2/radare2-3.1.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-3.2.1.ebuild b/dev-util/radare2/radare2-3.2.1.ebuild
deleted file mode 100644
index 0b3f4cfb432b..000000000000
--- a/dev-util/radare2/radare2-3.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/radare2/radare2-3.2.0.ebuild b/dev-util/radare2/radare2-3.4.1.ebuild
similarity index 100%
rename from dev-util/radare2/radare2-3.2.0.ebuild
rename to dev-util/radare2/radare2-3.4.1.ebuild
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 13cb33fab5aa..41019192176b 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/guilt/guilt-0.36-r1.ebuild b/dev-vcs/guilt/guilt-0.36-r1.ebuild
index 5a46d0b15497..52a9c49c0e4b 100644
--- a/dev-vcs/guilt/guilt-0.36-r1.ebuild
+++ b/dev-vcs/guilt/guilt-0.36-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A series of bash scripts which add a quilt-like interface to git"
-HOMEPAGE="http://repo.or.cz/w/guilt.git"
+HOMEPAGE="https://repo.or.cz/w/guilt.git"
 SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index ce745f9217a4..cd3ea7a66fcd 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
index dd69ff9bf8c9..11f31c1de8a1 100644
--- a/games-emulation/mastergear-bin/Manifest
+++ b/games-emulation/mastergear-bin/Manifest
@@ -1 +1 @@
-DIST MG43-Ubuntu-x86-bin.tgz 169112 BLAKE2B d54ad5ce84b02e1ff870510fce71447420a27d90b77101280b131f8862e4549767db5a375142e7eb3293465c5da805acc93f5ee737b3c56df66e1cba9d9420e9 SHA512 b39f03902d5046e8d8a64cd45d5d4fc1522a70d97d812dfa859d315a381181ba3c05a3292e24a92662ee4a95b501e6cb3c516eb1dea9d1d5b7e74abe8a2b3dda
+DIST MG45-Ubuntu-x86-bin.tgz 170508 BLAKE2B b7b3ae11569dd7f5ac0fd76c86d5d89b0179b804338b5ab40a60eab81c17d53b0071f68312fe53c6fcf0050b86d95dab75e1312a434bfb7c0dc927ef1355b2b5 SHA512 e90ade7f1dd894638bf5e5ca83229cc6673e879bff0f32aae112d2f1b56d4dabb287e1a5b59811185f6fea862fbc44bbe9a41b214e29d72355c31ba4df839ce4
diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild
similarity index 91%
rename from games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
rename to games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild
index da157fcf3639..f4c9e3d4307e 100644
--- a/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
+++ b/games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="SEGA Master System / Game Gear emulator"
 HOMEPAGE="https://fms.komkon.org/MG/"
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 7aa619ecc2bb..d91605b067f4 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/angband/angband-4.1.3.ebuild b/games-roguelike/angband/angband-4.1.3.ebuild
index 8a55a7470633..29f6be451fb6 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
 src_prepare() {
 	default
 
diff --git a/games-roguelike/angband/files/angband-4.1.3-tinfo.patch b/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
new file mode 100644
index 000000000000..8a1f487e6f6d
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
@@ -0,0 +1,29 @@
+From de53f9644323af0ff084bc82ef17b26aa6db250e Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Thu, 4 Apr 2019 04:24:49 +0300
+Subject: [PATCH] Link against tinfow or tinfo if needed
+
+It is needed on systems where libtinfo is separate from libncurses.
+See: https://bugs.gentoo.org/679942
+
+Upstream-Status: Submitted [https://github.com/angband/angband/pull/522]
+Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4a671f33..04fa8cae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -244,6 +244,7 @@ if test "$enable_curses" = "yes"; then
+ 			LIBS="${LIBS} -lncursesw"
+ 			MAINFILES="${MAINFILES} \$(GCUMAINFILES)"
+ 		])
++		AC_SEARCH_LIBS([keypad], [tinfow tinfo])
+ 	fi
+ fi
+ 
+-- 
+2.21.0
+
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index dc2d1c7d2794..d8e073112656 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -5,6 +5,14 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>stefan.strogin@gmail.com</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="sound">Enable and install sounds</flag>
 	</use>
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 6a03d739f1c5..be5d4952a4bd 100644
Binary files a/gnustep-apps/Manifest.gz and b/gnustep-apps/Manifest.gz differ
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 53edb62bc220..bf31fa483b72 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,2 +1,3 @@
 DIST sogo-3.2.10.tar.gz 32528115 BLAKE2B 7543f2165ed20026f00adfac7697fe6bc0e54f06b3c2ccb99fbfe0ddd14bcf8818521e161bb118789175c4245b67a8ad5dd0cd3ef71f61d34d869e1c0c2a4a93 SHA512 3dbd465592fd98968b32e251659a70306a781999bcfa9e63e142d75d7c9274edc7cbe5069881e939f0e9472f0ef8580e4e0f20059bfc97f8c69893d86c8cadf3
 DIST sogo-3.2.9.tar.gz 32443733 BLAKE2B 6a2ae4b5346bc48b9301263fe017308ee34aabcee1ce5444744b22c3af040533d98738fca29a195fd0f792d1d4470418840d0b1ff0e264c2ebc92877f420fa75 SHA512 070b3812d65598364d9204432678ea48705bf7481371e44442a13ad86d219415e24c579ad59212a7631922a527d30e69aeb17711c3abfc01960f663f4e0112a3
+DIST sogo-4.0.7.tar.gz 34455581 BLAKE2B 471ae8fc503fb2282cbd585286c0eede4e91e14bd9314a02089ffb0c69a8453538902cc26a4ebfdcacdce3d90f2d640221e1b452ad4b6a8064de89b1694eee7e SHA512 8e7eb946ab6ad8c47e6b612723675704602199b530c760ded5325f1230d89e7a812a61d9e652c7eca3050ed0bd0dd33d95faf2478f58a82dcba745cce4906675
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index 59f04d03a3a0..efbfee2b1c18 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -5,6 +5,9 @@
 		<email>gnustep@gentoo.org</email>
 		<name>Gentoo GNUstep Project</name>
 	</maintainer>
+	<use>
+		<flag name="activesync">Build the ActiveSync support code</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">inverse-inc/sogo</remote-id>
 	</upstream>
diff --git a/gnustep-apps/sogo/sogo-4.0.7.ebuild b/gnustep-apps/sogo/sogo-4.0.7.ebuild
new file mode 100644
index 000000000000..874bd00ce788
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-4.0.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnustep-2 user vcs-snapshot
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="activesync gnutls libressl +ssl"
+
+RDEPEND="
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.3"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+pkg_setup() {
+	enewuser sogo -1 /bin/bash /var/lib/sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die
+	if use activesync; then
+		sed -e '/^SUBPROJECTS =/a\\tActiveSync \\' \
+			-i GNUmakefile || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+	if use activesync; then
+		ewarn "In order to use the SOGo ActiveSync support code in production environments,"
+		ewarn "you need to get a proper usage license. Check the documentation for details."
+	fi
+}
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index e420590b5db5..98dd03aa81d3 100644
Binary files a/gnustep-libs/Manifest.gz and b/gnustep-libs/Manifest.gz differ
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 8a0c37bfcad0..859c54811207 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1,2 +1,3 @@
 DIST sope-3.2.10.tar.gz 2197170 BLAKE2B 29c3400d3162b2bd659d06fbd806fcfa3307fbf6f00048567e26c3fdac5e492bd511773b402f79b92db457e9dc995b5dadd5dc84baf6cbd89b463ae5e4d65457 SHA512 09c0e8ca7333e89c48e30b19dc3bbacca5a28688145848ff332ff304f92a791b3895774e5fd1f77c6d4c8615ecb5a461ba348792502fc7c5bbd9d445a191bccf
 DIST sope-3.2.9.tar.gz 2196831 BLAKE2B 9f62310ed61893d85d38f192b5639de44a8e6240463563c64e9c0551624c9bfafdddad5e6a819f15cf7fa12842d55fe417bff3972fe42fe07ac8e99655d90730 SHA512 ffa3d63eed5862aba9740ab84408297218ad6cd75b0dc7e40f2810366281bf139c55e27c11405b51dc1cf640d5f5434ee14c2d5f1d0384ad50684c23d8bc58b7
+DIST sope-4.0.7.tar.gz 2200743 BLAKE2B 1ab31ca92821b5febbcfa7776292a565216e40d6fdbe9afdf8bb97bb445a654716d3abd4736821b881cb464c3b7e46353910ab38fd853f89581eb248db0155d3 SHA512 6d723278f714f01b215e7b0cf046008b6448c84daddde4ad1f3434b8154a8bcede3adaa11c980b4f4b9c4950a07d545185483cf8ba75a8bac91e86437dc6e74b
diff --git a/gnustep-libs/sope/sope-4.0.7.ebuild b/gnustep-libs/sope/sope-4.0.7.ebuild
new file mode 100644
index 000000000000..65255d6c6297
--- /dev/null
+++ b/gnustep-libs/sope/sope-4.0.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( virtual/libmysqlclient:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 453f42bb7abf..70d6448c939b 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
new file mode 100644
index 000000000000..c1eef7a00386
--- /dev/null
+++ b/gui-libs/tepl/Manifest
@@ -0,0 +1 @@
+DIST tepl-4.2.0.tar.xz 456540 BLAKE2B 8861d2cdcddcb5b9e5aa58798835c0969dd12ce6c5ada69b5b97224f215bfdbf8ee0a7173d5c7cb2cc11894988351ce4df7a81e91e7b7036a48cc89e2cb9dd62 SHA512 32f69c6f0942a82e6b7f94eba776d55dce2af1c8e4c7abadf6af38a0a5abb0a94f0c426d5ec727b8eb478406ba113728b771597c2c84e508b8ccb113a74eab3d
diff --git a/gui-libs/tepl/metadata.xml b/gui-libs/tepl/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/gui-libs/tepl/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-libs/tepl/tepl-4.2.0.ebuild b/gui-libs/tepl/tepl-4.2.0.ebuild
new file mode 100644
index 000000000000..0837cfd954ba
--- /dev/null
+++ b/gui-libs/tepl/tepl-4.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-4.0:4[introspection?]
+	>=gui-libs/amtk-5.0:5[introspection?]
+	>=dev-libs/libxml2-2.5:2
+	app-i18n/uchardet
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${DEPEND}
+	>=sys-devel/gettext-0.19.4
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# requires running gvfs-metadata
+	sed -e 's:\(g_test_add_func.*/file/load_save_metadata_sync.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/load_save_metadata_async.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/set_without_load.*\):/*\1*/:' \
+		-i testsuite/test-file-metadata.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# valgrind checks not ran by default and require suppression files not in locations where they'd be installed by other packages
+	gnome2_src_configure \
+		--enable-gvfs-metadata \
+		--disable-valgrind \
+		$(use_enable introspection)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b59a3c9e1e10..49903e28db88 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 3107020d7e00..310d29ed5c40 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1 +1,2 @@
 DIST roundcubemail-1.3.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57baa18d1f057fdd2eb0f872f3cef1053847861998f8c6551fc17506ae365086ed1f86c3ee9e73a96adb2e43c6c32025e7afaf63710 SHA512 34dc9205cd93be6d6551086f4d22654dad7213b4b09000dc4def08357acdc634744ce1f560144a3d3b46e936258e90482e77fc4c691a55c205bcfdfe3745441e
+DIST roundcubemail-1.3.9-complete.tar.gz 5521697 BLAKE2B 4689bb43ff02b99a9b2b06d6370a5dce0ec4eca4e4da2a74e33e77ec74ec14bf22b6bab415c8b5fde9bd76bfaed87f183a8979edb353da3ed947f9bfdb0ecb15 SHA512 42ae9b772272b3e82476beeeb0fc5a909fb07ed0bfbdb655627b1e31da1c292f67f5a305452de31b2d60fe5905bcacabd6874dea394a9b0fd66b7921d73500ac
diff --git a/mail-client/roundcube/roundcube-1.3.9.ebuild b/mail-client/roundcube/roundcube-1.3.9.ebuild
new file mode 100644
index 000000000000..05e90ad0304f
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.3.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.1.0
+	>=dev-php/PEAR-Mail_Mime-1.10.0
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.2.0
+	>=dev-php/PEAR-Net_SMTP-1.7.1
+	virtual/httpd-php
+	change-password? (
+		>=dev-php/PEAR-Net_Socket-1.2.1
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		>=dev-php/PEAR-Crypt_GPG-1.6.0
+		app-crypt/gnupg
+	)
+	ldap? (
+		>=dev-php/PEAR-Net_LDAP2-2.2.0
+		dev-php/PEAR-Net_LDAP3
+	)
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Redundant. (Bug #644896)
+	rm -r vendor/pear || die
+	# Remove references to PEAR. (Bug #650910)
+	cp "${FILESDIR}"/roundcube-1.3.7-pear-removed-installed.json \
+	   vendor/composer/installed.json \
+	   || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 07c75f3f800e..96c0e7ee59d2 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -56,59 +56,6 @@ DIST thunderbird-52.9.1-uk.xpi 652854 BLAKE2B bc5557a1df83f9b8ca0671fb7c76fe3a11
 DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2b47e3b02346b734e728adadfa4656e4197ceb3328de4c5a12a076dcc7b4b412b0a32e3cdef41d888865e471b2601f2 SHA512 dec44726008af723e44146abb89754f9fd0684e3cce0f0db07c05d8a100a8a862e5f7ad028c0f7d3594965ec35251e7c357ac212fb78570463bd8c18174658c9
 DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
-DIST thunderbird-60.5.3-ar.xpi 627181 BLAKE2B bcbbda6174b102f9110fe470a6ff338ba5b16d155344398538b806a886b8dbcea6ce05f7ca22f41354844d275fe513a25bedd3c4fc780cf9672872c81b000d59 SHA512 6aa8f6d06d03b790890d4bb38fe90bca4f5a2b93be327aa1bf149dcfd19b548f1007cbc938ce81421cb9e4f615582add43e4a81f3e325b4fe27c9fcd3facca33
-DIST thunderbird-60.5.3-ast.xpi 559643 BLAKE2B 1fd59bcbf38fc70d7b7ec8d051c91253f054c238a1d4c21df05d31f036b56b01ce8b7eddea1aa45a21e4bfd86d879b5f1f86101e16e6c4badc96357e1422df97 SHA512 5008e084f9dc26caba3c04620063a85c7db2f2b89c2eaddd77edccf8f324ee054ca92eb080a364a61e3b73cd87a314a8d41e49f8f9b27e7601fd82e1f6f1c013
-DIST thunderbird-60.5.3-be.xpi 659079 BLAKE2B d9997d70653cc422fa8a3a1bb73076691eb39f059886849637535334536cc5947b28ee3a802d9c2d51e6c03fde952a28f52d15e10fe8627406947ac70cd20720 SHA512 6232ba35db14fb99856f09c9b66827640332abc09c78ef99938050e3adbc58d039318eca3a9f1f154a2a2c526796de3d355b5c5cd789b12168c993498bb67c9e
-DIST thunderbird-60.5.3-bg.xpi 669317 BLAKE2B 2d5291c752de13714fd0a4373e43550fdec53e5ca26d7042167255854dcbf0c327b60df5037299d3a4e86224e33fad491ccd26952189c5420ff0d183487a8503 SHA512 c73f41e68e671172c877aa1a305360db7caa7894361c1d0ffb9d0e0b6b1c5c00958fdd4e4068c3bafee0da0152aa5f01f1aa115227331c5e6ebdb3b7be1f700c
-DIST thunderbird-60.5.3-br.xpi 580372 BLAKE2B 3e0bd00b75411e63faa49665d9effbbcf2286a3595b2fd04f313cfa9589990de170f028db600422cd1738a4df722722c8125ccf0e172a6cb420236436c8f37f2 SHA512 9a17707c485c3bb8203ca7daf50ed7fe36b08376fb454d3fef958dc86c10f2f898fc534b5366cf39187740d8ced3be456ad18af9da684ff7425339630dab920e
-DIST thunderbird-60.5.3-ca.xpi 591971 BLAKE2B c00610d637419eb909ed07fe0d87ebeba7aa03eece0c9b6cb8dbc5a8f9ffe34131858a6cbb07a124993f5d79be562fdd3e4be787bc150e379d32b9be5921a541 SHA512 39489e3a9c000572f8e7e36e2384f03169df30ea84dba5890260975cd99bc831f2cc9c2325b8aec64749b48f2ee8d08c803c8f637ed7ad8ed7fc70d6ce797b6b
-DIST thunderbird-60.5.3-cs.xpi 611203 BLAKE2B 0a331732009cddbaedb93d4a1cacee3762a562e18e542a442f55f3ae8ed6bedd59a5ce5b099f15e6a97b6baf05ec3c8a67fe2ada6ce4807e5da4df53124b44ae SHA512 d83e19d7a89ddc162fac3ebf71cb0c1213ed259788549fe3e75891eb8781304f9ed238e9b64133bc69d222f54b2ee4bdd7c5b4fe2eeabb98e8dc8bd5d1c93574
-DIST thunderbird-60.5.3-cy.xpi 586039 BLAKE2B 2e969443daa6ea9aef183ea46d53b1978d30712a6b85d73e796e2a94a06e6ffd3c2e99b7b9da49ebe84a36e1219bf37b408c071cbdd68cb9f997688d22e324e5 SHA512 9508ac8cac4c711bcaab9a41eebc4ac01c5fe09f2c501008643ae0b9df16fe9de0fb16a2a1362fb58732214232570f3578df6bab0cbb4a6e166e0dc92caf2934
-DIST thunderbird-60.5.3-da.xpi 570807 BLAKE2B 72f4956929d549e33cae9506de26bde8de814fef9ce04495137c2b443ef9f3cfebdca409d388652f69e5240c35b9b4e58a49c46221dec8ae1f610f4729db6e8f SHA512 c366a0d7940595c8b53e69ff961f5ed0580d291b89ecdc1db36ebd9da55153e951d790866a6f025e288856beda8fb43269d8576238a704bb651657af7ade6e7a
-DIST thunderbird-60.5.3-de.xpi 582575 BLAKE2B 5613dea86e8c725a33a2255fe1dee2f014bcd9b7f1a0828457d30293a23f5e4ca22c3398afbfba9dd9c64d9ed7bf2b6ac55dc77148b9ee53ce6ee11d23473caf SHA512 46c5405368ed6ed00c747a6449d815396a7fdae0bab5472e5b5c061acb3d8b5ffc7d08f776356a0b83bdddb77ed80bfb078253d5efdd56559838e11d4d90024d
-DIST thunderbird-60.5.3-el.xpi 694858 BLAKE2B 7a0e1af405d4cc43857aa5b23a002baf30914ed65ccee1fcc1b491c0f060a80cae736232f23504ed1a7eff53a11d1dabb4f7272fc4261ec7b791d993edc940a9 SHA512 fc9beb99c581aa381c4488c2e9396a429a3fde0407e8b2b4684182882c8b6d1551f73d0c7ba7d5c050bdee0d13487653d71a735a15ac158a0153cb82f81a920a
-DIST thunderbird-60.5.3-en-GB.xpi 553896 BLAKE2B 81669f96a10788f9a8a009d0390cf3b0dedab006d6ca3b8d6fa57d4e937386ec213dc83503d369e33e28ccb4f483821dbc1d6447009f7fdc43d6efca94d765ce SHA512 44de972f64b8c276fb1b23220666245611e771feefa37f5d293795ceca6bb9025345356ebd6d45eca4e306abfa7303404776cb4155d356af1dc4bceed282ccea
-DIST thunderbird-60.5.3-es-AR.xpi 595048 BLAKE2B 882a474d22321bece82642452f268d8c07dab7523be97551ad96dd7352ea10f1e4ac78e71b536dbda65a27fd60c14e08c1e3377838aaa8c8adfac7445b727b55 SHA512 154e2841e2c12df883ff6c381ba82b47c177c52cd831ff89d3ab809f88acc7125eb6ff7bfd4f39e7894e38b24d8992c2f174ae5b8710c5fe179ca73a6fe0e43a
-DIST thunderbird-60.5.3-es-ES.xpi 492212 BLAKE2B 50008d0c8f97e97c25f386c690ced14dce894122c41d97409c8875bf4979bf656d195ec3131f42e86c1ef0bbd8978c1bbd6cc118ebfa5372c1f893c60f31cdec SHA512 fa21fa829b64b7e68062b6c29d9a757f35d9e5be9272d772796a311576d792ea2af2e2f25e6cf81a246e6085c203c1e805e9d0dff1c6a78f498b31e17c1d2d97
-DIST thunderbird-60.5.3-et.xpi 570868 BLAKE2B a59cac3030f20345865ac1bef0a4baae8d69080286d5f24db4930c5866b235e6127d1a385510de4a10fed2fecbe0b7af74b3a505c32c24e150a5ab38703fe893 SHA512 f3df4657ef1d76c9469ee830f94aff0c0309952efad0f814755fc7fd758705b208371af15ded3b985e7555aeac4791730627cbbe719bbd9ee4350a4de88750b1
-DIST thunderbird-60.5.3-eu.xpi 581385 BLAKE2B cbe9c4b6aa8bad77a7508403944b14f4b3871641f3b0e67b892640f685389dca66d0cb99e07324eb51b2b0288987d9a8daca83fed923cf4b792a88f3c5c13c9a SHA512 33bb369235c458c468a1928d3c341f17a61965142ca7a47223e221dd3bf8162ef40349057204a05cbd7dc029529ad820beb58b70a75035680c61f82b0085a9b3
-DIST thunderbird-60.5.3-fi.xpi 575755 BLAKE2B a7de65dd9665871344dbdf524bd0b66180c53c2f0d097840d0be6d015bd23cae38c6afea5c04b94403bfb84bc66b372641aab78a52d6f8ac2a9008e47f991877 SHA512 76c150e0549b913fd76317664a4b1ef8d0ffc1ec15b03bf44244c70bf237f3540bb886ea481f02941a2abf7e04878923d6af008cd08b4894eb7a1071bafc6a01
-DIST thunderbird-60.5.3-fr.xpi 608466 BLAKE2B 9a60f7a16a43cadc2e6556ebaae404963feb5efe2a9183a40d60c04906ad95a7839895622d0be3920a203d29b026087d4a95987ba00776539ef4ac4773a071fb SHA512 a47d98577f346c02a178408b0c5fda39e28c09fd17da56275c1d83f8c2eb080d270adf4a7e14af71c3e9db917d201492819e679a089a08f16723934845fc53c0
-DIST thunderbird-60.5.3-fy-NL.xpi 593851 BLAKE2B 9bdecb6b31df3a896b2e0b07f0df6d75e83618a88a0311ff9e720c03fc16755b75201442791cc4fbf5362e798f59e6e6d23a8de7993aba9cee7326f2efa1274d SHA512 5b2c824da3bd80d9e900227e59e9e15d8de3c819deced24e163881082ce578f4f82c6fafb38c350f6f0a06375ac1ea1b0e04d45a3294619d24a14c26503362bf
-DIST thunderbird-60.5.3-ga-IE.xpi 603505 BLAKE2B 1fe6f120f1181900613db972e332e0b9249f457262ac4980059ef061e175e247ee0316776aa7e41fc1051e65cc63150f1b70d631d04d6af07b6f22e14a68e7fc SHA512 e8624d2dcc33e3dd4aa74bb51ec24f18f23fbf690b7eb147582394cb223d840cae05b8ade30dfb7a71cf08f17c7e73d110449c99a550089c1456086a731f0b7c
-DIST thunderbird-60.5.3-gd.xpi 599262 BLAKE2B aa206bcea3a21c5e487bf2f10dff0c47eb24dc56801aa56430802f952a63d8cc4f98580715b4071473df0041df97df626c704dd5a9c6954976a476f03a9471e6 SHA512 88aed8ee1748615bf217fa86c2454145bc12e1d433a10a2e0a7f47ad75251a9def540e4b419661ef987961992aa7bd294453ed222d0371aa4747efc79d9be823
-DIST thunderbird-60.5.3-gl.xpi 580352 BLAKE2B 4ad06648e88bf6d61932fb0c8703261a90e6590ef5dabd78a1d851c9b1379051aa6c3688be4fcf760909a3da663ab93e52d6f89d538b9fd6d4d507f664b0dd94 SHA512 206d41c81cef5a6388c4e9293affc7d29315db3ea96c76133cfce4a881e3a8e25582e917b2f0f42fc90a251df8dace46a85be732bc2736794983d28ddfd3e525
-DIST thunderbird-60.5.3-he.xpi 617144 BLAKE2B ac6683598fd25da35426268ccfad0fb651454aafd598fb584149ea7e53e6331d3f578bcff1537bd1cb023a3080568dde12544f1496509d78bcd393e9dc8e52d4 SHA512 72606b13bffa02aed21ca87043a72e8dededebca9045e51cbbe9fcdd378dc63e8104249c2e58562019322c0fb18a75b12b77aa3ada32874874653d60d419a896
-DIST thunderbird-60.5.3-hr.xpi 582239 BLAKE2B bfc325a8d466ad9252dc2b9caae78df8b68a5043f52297efb973732e9187605a8e17072bb36ccfca1349b7f1746249ccd79ee2e6471c99434e1c23b88877e8e4 SHA512 b4d417df37e942670354fe1013c56b2bd8bd24a65456293c21f9e1fadf1e24f2debc9f6ba74412726d59484fa9fde0ac9f3ab1c02d3c40b5c30c2a2af3e0f4e4
-DIST thunderbird-60.5.3-hsb.xpi 615132 BLAKE2B de2b4937fdb271865cfbf2f7c3d5d58e21264bf1dff866675b507a8f4bb964898ed78ca2e7ff7ec73fe7a2084c813fa833a49c544658c9a2334901829ba9942b SHA512 029c115e0fd733d6711e1de5faa6cc08823f581193fe6c3e08b1d3c9c03bd00a9f57726b862abcccc2d81d30ceebad7f2d4b806381d19c4183a98e4946b32d22
-DIST thunderbird-60.5.3-hu.xpi 615346 BLAKE2B 618357caf08541a98463fe28b1b15561a58c92192c24e4b0159c2677f5e01b393945c75b970699ae8bafae0ef32bc4efc1306a03e7c945a40e9d32f64071d63e SHA512 c911bf162971dd10fa644bc3df67dda6e58ca1b277e35c3491be8f52a177c8a0ece2944bb0357688f20c0597aa98584f79f237b5c73686162a7ddd0a5e0b2a57
-DIST thunderbird-60.5.3-hy-AM.xpi 653531 BLAKE2B 4abe52413106cfb6fb2077e65c631e689ab89e7d33cee27c407fb604cbe3975a9477e2d477dc553b2fe5eac3d378fe59a1abe456cfff9c6d935138199d99b79f SHA512 b007c0c8a9b792993f3eaaa0aa3dc875c245763b62e2ad0f1217b098057ac397dd415c29b5f1269d531dda9e3e0f7b998f10ca545ec1f12ab1074b1cf9b1674b
-DIST thunderbird-60.5.3-id.xpi 568861 BLAKE2B 8d2c50984cd6f6fa33f517fba151e5bddfa60218f7a6d13be651ffebc8afddf87a76a04ab7d71ca79588282e279cad3fa856176df4d92bb184cc589c83d4ef59 SHA512 8d8ca7af841b2d7bb69b95c425b8a94f8cb7ae896f92243edd788c21a45d0fbf08b462d7fb5bc017efa4b6e2254f06269b117abc8757b72c29bbcd027fdce0cc
-DIST thunderbird-60.5.3-is.xpi 579048 BLAKE2B eed2475a57873ed9cd078bd3d618e67468904f05dbfbb9106113537b5cdc374dad9641daad3c139cd51bd0c7f37857a9f58a83625f7bb350010e9fe790110596 SHA512 6249b0a56a73fb79f5886af127dc601e2a8b92d5afb0d57866a536d0e4b1686bc7ea71e15a18a76a1759885ffb31edf923e31dab18af36e710e128421af2856a
-DIST thunderbird-60.5.3-it.xpi 477500 BLAKE2B bb577887568e672d8c92d06cf9697aedd682883b6b6c7047845533a14a9ba13d37e685fac899758d0141136b3b76f797782d2db96e7a36e10202ff5c8c51dff0 SHA512 212c90e55a56f035bd38d60433b36a030b64572aae79d1755ef9c0884b7e071383fd1153c8ee64482e1e0dabf699ef52031ef6a722bcb160bad02d0edb789f59
-DIST thunderbird-60.5.3-ja.xpi 653345 BLAKE2B 55609176ab64d1de3a1dd5a0d26cef923fb42905d00fa9134bcc35c50b98d27a6c5472abcaf4c1272bc1ce64d7126206d40d9ddc3ac4890a337cdf0b3c96f2a1 SHA512 a0ab061dfbfe74a0709531b011f2c897625c6782601868ea12f8a85ca49615f83fb3dd5d1bed4363776e08664006e7239a0aa7c4699c5a74a7fa403a827d00d7
-DIST thunderbird-60.5.3-ko.xpi 619730 BLAKE2B 7c68c9921c125535c4de9abbf714a7dcd0ab52369a506734ed5f7253e14813adcd99a1e6861f56182b5214c63a1bbe52d7a6284713d789c7c5244c0d68cc7725 SHA512 2ef936ed6c1650cf3ddcd04d58462a4f13d0a492c32920dca2606ca6adf4d8bb78b8bbcbbc000e442e841a83e35c6ebe3e20536ca2c81d087bc5fb3f1b8c3547
-DIST thunderbird-60.5.3-lt.xpi 605442 BLAKE2B dc3076dd4869da8db04f0911f518af1c3f8d907f82bc86a51fb1d5ee701154db0d67dff945749788e5b97a5bd2f772602f7ce2f167582fdda4399ec56e99e84e SHA512 876e70411b5aa11f041b1bc8c8165263248978c2de24dc900ef89df7b862368b4d4d36fe08af0d91f0b90414d48b677fe477c7addd72b5a24ad0d0be305c5448
-DIST thunderbird-60.5.3-nb-NO.xpi 577003 BLAKE2B 58dcfa3106b47b10f7d95af8af688f7517d53325db7bd87221ceb69bf75ffe98ae2d719c6017caa477211ebed9e63d0368ce36f522c0cfa97c09c7bde105360d SHA512 a05d9e3911b7fad6b413cc341d13cbea442646d9b8ee07c61528d8682f345a08cb7295ac42cdefc25210e46b51a7086451bbacd0bf0ed4ea4d228d5928322a94
-DIST thunderbird-60.5.3-nl.xpi 583912 BLAKE2B d773069770bf0d20f8f8ab30329ea5803e3a66319f655c3c8b40058bd927bf40b495b13465ae130652a5d499e427eb6c78ad9df531b93e65cabf8e95178b9ae0 SHA512 52eb896e06672ce2a2b39c4d212c64bb9d5912bba3cb6f7d5e7b2ad7cdcad4cd6e2758aab8847e470c0ea2f8d02f2498d4bfed64094af3aedb599f94f54fe639
-DIST thunderbird-60.5.3-nn-NO.xpi 576422 BLAKE2B ce2e1361d30f7e69277328f822f2da5428d103003910df33e6a5d314ef0e4f5565804de4d0f9102545118099f22e60babfd865a89d666c14ae3babbfbb3d32fc SHA512 c214e5cbb314ba54951d7d6f9ef3c9342676f2485cefe1cb3aa2a0dac4b0258aa724eb3f2138c5a0243c8cdbc6369265d73417857a387e2fafc7bcfa87c9f54c
-DIST thunderbird-60.5.3-pl.xpi 480725 BLAKE2B 1b53c166476c94605131ce6f816e860ef574c25360ff0a971c0781dd28a71ffde3d272a41f908321d0ea8b6a78d00f453506964b79c0571728304c2651e9521b SHA512 0cc7e6b8d437d81c6448d815c028d8af4a5c8aa7f23f8d75c49e7fdc47672686c47889361db72fc6a301b7511e944fb45922182b01309de2e5d48617caafd982
-DIST thunderbird-60.5.3-pt-BR.xpi 588835 BLAKE2B caf4ed9eebb4e659375e74d1544283a51b9ff794f89ee979437f509c0806922f2038c99d8f0eccd718403280299aa7a72f8bd5d1a40f1fa5925edebef06dfeb6 SHA512 43a3379e062ecd06ad0a4ff8847d18626f334f9681ed60fa189d748307ad24b79c58d052c4f86c1296d117a2758701d27099fe28a2451e11721e645767ea67d6
-DIST thunderbird-60.5.3-pt-PT.xpi 593186 BLAKE2B 2870e5484619041676b94f672e6b94998f9b44855c07fe73ea27f5b362d9c51f4b605057909ffbc1802bfe3b47c1926940ccda6e49dec69f6d81dd131637cdf3 SHA512 13409903e2da5433461e81fa1354196b17180ea75d76924d9d34cf52c9cb15e1cc45e94357b936c9ffe8c140e81ff5153bfa4460e1cc463669f1cf7c9aeaabbd
-DIST thunderbird-60.5.3-rm.xpi 578384 BLAKE2B bff6310528b3d7d99103615a36c4e94fe0df33974fcd3c958463f1b32c59068e6b28e65a3c2969fd9b372abe109422caaadeebd6ac47cda2900eafd2cfdad16b SHA512 700ebd0466e7a82c85445b56cd8f6496b03d1f623cec9a2eff57d6cdca7dffe5d77102e5cde5707ade532a3c37899d0aac99b06f4da78aa5422ed333712407c1
-DIST thunderbird-60.5.3-ro.xpi 584309 BLAKE2B 631534a9321f4f1dc1e731f4013933ca68360cb251cbaf07dbccca2e4793b5e13c41fc95016d9cb52531d60ef9a42080c5887d264a11f309e91cc76519ec56a2 SHA512 913079718a98c4db8cabbf30dda7de4b95259b45926a07a76703b7a07649f176b6909f45d235fcd0c4c912629c3867bd559ba74f66d71aae174bc1c785c6df76
-DIST thunderbird-60.5.3-ru.xpi 694705 BLAKE2B 566c5950746274596cbbfb7e8f3eb6f63fedef91a39a3b97becc90abac28f97ac6194c9bbb64c7bc1eb7df6e818e124d56e58d8770731415835b697e1b86a4fc SHA512 89d276131c8bf95b67671c58aefaf1892faddc306a16f6dc656af4c33c80b5db87aaf229d99425d5f97561f2bf72788979d03e5b36d4dccac83678058d82c8fa
-DIST thunderbird-60.5.3-si.xpi 647592 BLAKE2B 213e0e20201758b7eb22fbd31f6bbd53eddabfc77b4ca1464cd96556f0e0793c7487aeba3b03cec45330d6d960b06b1744fd07a0869201f97194f0cb781a5b26 SHA512 457afd678e39f9f8062c2a26c6249d5be464116992080c2138528b02fdb1f0a5d141be1bd043a7866c2038ffe1146d31944a3ada836ce21fa22b904307107d15
-DIST thunderbird-60.5.3-sk.xpi 612218 BLAKE2B f281b2b86615530e396515efd1e88a3ebf83eb8a63692d2c06f21d7c91e238c6fe6069a521e47e5f3dd29f7c4b46f017cadc3e21563d38145ac1520acc13496e SHA512 3c3cdbb8f9fede704fc1bc445cf5129739e263a13d7f2c9a1171c7707a25f5079a941248ff3cc6a65e5177cfdb595e04b056bbde413ffc6225a945a18fe46632
-DIST thunderbird-60.5.3-sl.xpi 589947 BLAKE2B 1f75449b5b009965d4b378a19c3c981810bc8b9302e2098d0ee5341bb2073fbb8e6c8ba7320fd0ac07c5a927651d4ac0b6287ef6de4188aab96683473558da22 SHA512 1550fb8cafc7b6bf1ed1003324d2d6836253d7e42bbac697027a8e3bb8436bd2a176b4d0a832568aa2bd2e1a664a38d51d3bb36c22e219871caf9896299f3056
-DIST thunderbird-60.5.3-sq.xpi 593096 BLAKE2B 7d0bba5a472600b5204288c13a673e61f5e6b6bc9db0dd61c4f90ef8ba8907deac7e2bce5c7154a7d287e37f5187088ae2cf0a1f3f1f0a5ce70c0fee60ad8a8f SHA512 3bd718be055e53be9fea9a83039c1b6103b24911d0a5d3710723b64ea02c4acea349a1ad8319faf6451a55733190e4c2bd87f47358725d81aa20e77ead3bc86d
-DIST thunderbird-60.5.3-sr.xpi 641527 BLAKE2B e9b323b4ac9ed89913d364c000a504b0ba577940dffea6c30cc44f2089640e6af8acfc9bfe8af89bd6d49a7fa15bf801c343c07c0acba42ba7e8537f03edc1b2 SHA512 9eaccfba8a209dfb97cf6239422d9e12340bcb861321ed7f439f864d8834840d7e7e4f6664138ae79d4d8f865b5b72c5aec2a044aa2ab73f25a06fecd9b87d78
-DIST thunderbird-60.5.3-sv-SE.xpi 594079 BLAKE2B 668df08340d40fb6ac7b07c04b769db165996e92ef6e028357f2fb16bd695b77c820d47d11dccf4039d681033fe78699aa13042063f6be4d83201b5a50da4cb6 SHA512 5862c2736209128d2eb20b1cdc75bc1296aca3755685d962674c4e0a3b0b4441fc0f410da080bad85386474c5c1eac8f414d96fe2715343c81f3c4f18487a4e5
-DIST thunderbird-60.5.3-tr.xpi 598010 BLAKE2B 91225e58d72ff5264d13e6a3bd783ed907f7f067e9a9f7a34704d42b16f6ee596d93631cace8fa3536acaa820c826901108eb8e2e9e84c0210dd70c63b8b9295 SHA512 a368c162b19496e83a27c28161909b87e45d50a1faaee312a50ba0cd2e2380de1aa9c512d8d354cfe1972a3e2ced24d3aa62c951076a243336fbecf5b39778fe
-DIST thunderbird-60.5.3-uk.xpi 684155 BLAKE2B 079bbc16e8cc9fe64ad203d04b735a297724f55975cb4c62a78e1498f081300102907c06c3d9c3643cb6105ffd668220e6c678f05d005d292b95315a6d4401e2 SHA512 7e33ed75dda430329ea0014caa382e3f8e6c57593d2d2178bea8b14e5cc8d8df48bc7a29bc423e88bfba083d62c338a54b7a00a0ad6112861fdbfa7c4a6a5031
-DIST thunderbird-60.5.3-vi.xpi 637197 BLAKE2B aaf475ec7800c6ecd5d450c0697e6f9ef53c38a8c77ec21ff6a4637e3e496d34e671c51ff5e51b5b1f4cb88dd7afce090050c3e21c07bae7ad0f3e36d6ae4b68 SHA512 9ded56e89a932dfe84ce0505cc6f927dff4a106351483ee7ba309d45b4b663f508fd55c59b52869271798e78dfde907a4c38d091331ea1dfcdb709e4d9616934
-DIST thunderbird-60.5.3-zh-CN.xpi 626283 BLAKE2B e8f63b43a7060cd6a56696d38b7fd7a35311b015a576ce3e13dd5528cb97f914e3dbf393fe71d29f9d1355769e31b3190bb1e9584e8b9992163b24f122627b63 SHA512 a83c5e9de03027ee62402510daa6c7afa58af300b9b2605f840220ccd70361492011473f1b9b39d0162235471175c50b998aeb56649f087a87fe9cfe6225c927
-DIST thunderbird-60.5.3-zh-TW.xpi 626189 BLAKE2B 91175d151a1ae7f0a191c30b3e40ce47b2616fe7e3c8a9aaac1fb832b1dd29dbf74868015d909b17eb14356e69f80f94ed0a9126e9cdad640e571d7730a1c0f5 SHA512 a96dff2e5094746cd84ec9e14b88580fc3481a82d0f52f78ef970164bbd7093fef1eada4fb0a832397a39a98c7d4dbdac8a667e071483e36a5e888c0d6702158
 DIST thunderbird-60.6.1-ar.xpi 627180 BLAKE2B 56df555c0681214450a28d1eb126a1e0ebad308049c2f64480dbf20f39b5e62ea5600ecf81052a2c13396044ce77c6d27ad0c1fb6453c329968ccfb505de16a9 SHA512 76a92d776fa1efd6db1a312ad6ca016ca1cd2b70eb62ed3e309417ee02a2fb78112295d58a0d1e092cf1b36440339643a3c290dd1098c6087d08fa39515157b3
 DIST thunderbird-60.6.1-ast.xpi 559642 BLAKE2B 77892bbbe45a04c60e62a01ca98f47aac139f282a5ac06eea62d2ce518ac6cbc8d6c3765d16f929c8792b5731feeb82491eeeeeba0ef6d0116442f1e569c0d51 SHA512 66130b52317bce1b92ca6d1922d56c062196bdd5e158239640e1d040830b5522227f13e86b1286f6ebf569a8de5491ab37b4e8d7af7c5965b2a7e5b14509235e
 DIST thunderbird-60.6.1-be.xpi 659080 BLAKE2B bde346f25b24c2253c7c4ef034dc8ffa1d3b742254db95a0baf9dc2a00fdd27a22f9dd7e6d32ff288ac87e6302193f7e7e1aff0e76dcff0b64ef6b9acd6093f0 SHA512 95a8afbf179697f819704668951907709033bb10d7212e7b6741910b39960a7c9800e70f343022185d716ef689c1c43e10718d5245c64db4cb5fb128a3b641df
@@ -163,8 +110,6 @@ DIST thunderbird-60.6.1-vi.xpi 637187 BLAKE2B 3ad95e1dc2626b24e7ae6d262594b3b384
 DIST thunderbird-60.6.1-zh-CN.xpi 626283 BLAKE2B aeeb293e5c81323c2ca873d589ec5e6e187767e3535fdb1d039c547ed7bb661a134c84a76fa971ef72e2c1acca947ca7170fa7355797f51443e32618bbec63d6 SHA512 b668158ff20baacfea259b17b9b0f1993d59352b3ec47fa22b5fd337c8733fe966e75142b85fb65d6de30dfb5fc6be48f3fad6decfd9f0cc467f68bf8c49c884
 DIST thunderbird-60.6.1-zh-TW.xpi 626190 BLAKE2B a4b79f607151e532598ac7c4a1d834e83445601a0db304b249e569b592a21c3967b8f89535a45882dac5d5c851e4ad640c955e44bef5606840356f0c280d4563 SHA512 934f9ea341619e0eccd83472bac778767f10f3676c2d072f42301aaa9cdc0ce683a12fd51d9981fffd6b26cc8a61da0ed13b52f9b97914b8309b082fc4f8736d
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
-DIST thunderbird-bin_i686-60.5.3.tar.bz2 52603826 BLAKE2B ff2d5062bea2cb523cc548baa34d43d2764be6dcc3c13eac5116cebc547f6df5e946b7b47daad54f4f84b115994a23d5e452eeffd3e3af073bb4ecb2a2d334bd SHA512 8e08fd1eaaab33a18b07df167474b99ec096535cf6d90dcd54eba93b471dd80822732a84a0f10ff54c204e9f76b6fc600edae7be500b82a444a58ea3104ca982
 DIST thunderbird-bin_i686-60.6.1.tar.bz2 52679266 BLAKE2B 92e80adc276f370bb667a222f3da791abfb2ff26f106aadab21ccdd24da73a500bae7d50adb55ead3099ff7005147c6a40df6615aaa946c0f590dfb83de1b8bf SHA512 e0e8c9523c8051115659970974ffd3f308001405b99149275d9c5622ddcf1abc79fb81595303a4c8c325e2cdb1107ab9332429eba191e5b36b37488031bfb635
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
-DIST thunderbird-bin_x86_64-60.5.3.tar.bz2 50316483 BLAKE2B 7ddebb5f3a60269ebab85b1b06ad7dc7d94d3267b82d9735e586e777c278e78e7468bced55f8a7310ecced7c276919f8d4cd46c2502c44c3648cffdf7004f27c SHA512 1cdc4db705ca0e0ff75c26ee1098e2a27294b0ee2079844bf31569dee5dbeb52fa6105e2b50f19215bb4c6a0c94973e92a914836e90fa3b8b96381552c708603
 DIST thunderbird-bin_x86_64-60.6.1.tar.bz2 50565453 BLAKE2B 74b323e1ae3beb0dcf773983cdf2c9b3ca8108098c7b5bd249042eb6e00b9998aa95f90269e4e6734c357e6448419385eb326abf0d8089f384f3f73ae94aa965 SHA512 a3413e19b91a5fa2dd59a4582cda7d1053d25a84c7ddeeaae8b0b47b27fbbac26388911ecc1a5db0a8e5113efc8a150f843a96cf4a7e4b6817d1bc27d7c43c4e
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.5.3.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.5.3.ebuild
deleted file mode 100644
index c62086bbf2b4..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-60.5.3.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-"
-# the below only works when upstream releases the xpi with all locales bundled
-#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="https://www.thunderbird.net/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip
-	app-arch/zip"
-
-RDEPEND="virtual/freedesktop-icon-theme
-	dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10:2
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/pingsender
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-}
-
-src_prepare() {
-	default
-
-	# Lightning
-	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	local emxpi="${S}/distribution/extensions/${emid}.xpi"
-	if [[ ! -f "${emxpi}" ]]; then
-		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
-	else
-		ebegin "Add localization to Lightning ..."
-		# hide warning regarding extra bytes at beginning or within zipfile
-		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
-		rm -f "${emxpi}" || die
-
-		# Install language packs for calendar
-		mozlinguas_xpistage_langpacks \
-			"${WORKDIR}/${emid}" \
-			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-		# roll a .xpi that mimicks what upstream would roll
-		pushd "${WORKDIR}/${emid}" &>/dev/null || die
-		zip -9 -q -r "${emxpi}" * || die
-		popd &>/dev/null || die
-		eend 0
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	local size sizes icon_path icon name
-	sizes="16 22 24 32 48 128"
-	icon_path="${S}/chrome/icons/default"
-	icon="${PN}-icon"
-	name="Thunderbird"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
-	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index d33f2f595873..f11b4c25a90f 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,6 +1,4 @@
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
-DIST firefox-60.5-patches-01.tar.xz 13332 BLAKE2B 53308d415369c6814504697ed9692023e636c42b58053867fd14e8edd94baa2777ed9f33e147f796d6fcd5f30c1d2258f9fd3247392e37a921a53f41a6903e92 SHA512 de24544c5aa8ade35e4e3e0fac10399f8eb44ea4bb9063b85bbcf2db12280d23ccc5fd29032f33f3723c0a0c3c2381429e2c19bd631e90615908b4f68f745a21
-DIST firefox-60.6-patches-01.tar.xz 14548 BLAKE2B 412059a6db015fff0985e637768426f877b33bb6b649c54f1292780b9d871f8fe9bf8e6b150ec36ab3647b4501fa6aec821c089a5d6fa861402f05e948f1a9d4 SHA512 b97da7a7b65bbf53cb6b9f48fc6c07a32cefa9d4b4a79ce57df047f941f5269e21bf09fa56a5f31bbf757ed2d76f8a1fe01d2306c92d20cab979e0a21f895e64
 DIST firefox-60.6-patches-02.tar.xz 15788 BLAKE2B 1be3fab620fcfa0e59d1ba4519577600e7cec4e1fe285bdce9a70e0c4464cb205850d39f8007b7ea1cb4eb3c019170fb66ec17911fcbaf26c50370a14e9bf087 SHA512 092ccdac1198eb775dc3dab05cd5e852b6b0c5d6557d58e54f86515f876f8ae025d872969331c482cd77317a8813a9f5926ea37d08af9d433246e2b5864d7cea
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
@@ -64,114 +62,6 @@ DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
 DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa
-DIST thunderbird-60.5.3-ar.xpi 627181 BLAKE2B bcbbda6174b102f9110fe470a6ff338ba5b16d155344398538b806a886b8dbcea6ce05f7ca22f41354844d275fe513a25bedd3c4fc780cf9672872c81b000d59 SHA512 6aa8f6d06d03b790890d4bb38fe90bca4f5a2b93be327aa1bf149dcfd19b548f1007cbc938ce81421cb9e4f615582add43e4a81f3e325b4fe27c9fcd3facca33
-DIST thunderbird-60.5.3-ast.xpi 559643 BLAKE2B 1fd59bcbf38fc70d7b7ec8d051c91253f054c238a1d4c21df05d31f036b56b01ce8b7eddea1aa45a21e4bfd86d879b5f1f86101e16e6c4badc96357e1422df97 SHA512 5008e084f9dc26caba3c04620063a85c7db2f2b89c2eaddd77edccf8f324ee054ca92eb080a364a61e3b73cd87a314a8d41e49f8f9b27e7601fd82e1f6f1c013
-DIST thunderbird-60.5.3-be.xpi 659079 BLAKE2B d9997d70653cc422fa8a3a1bb73076691eb39f059886849637535334536cc5947b28ee3a802d9c2d51e6c03fde952a28f52d15e10fe8627406947ac70cd20720 SHA512 6232ba35db14fb99856f09c9b66827640332abc09c78ef99938050e3adbc58d039318eca3a9f1f154a2a2c526796de3d355b5c5cd789b12168c993498bb67c9e
-DIST thunderbird-60.5.3-bg.xpi 669317 BLAKE2B 2d5291c752de13714fd0a4373e43550fdec53e5ca26d7042167255854dcbf0c327b60df5037299d3a4e86224e33fad491ccd26952189c5420ff0d183487a8503 SHA512 c73f41e68e671172c877aa1a305360db7caa7894361c1d0ffb9d0e0b6b1c5c00958fdd4e4068c3bafee0da0152aa5f01f1aa115227331c5e6ebdb3b7be1f700c
-DIST thunderbird-60.5.3-br.xpi 580372 BLAKE2B 3e0bd00b75411e63faa49665d9effbbcf2286a3595b2fd04f313cfa9589990de170f028db600422cd1738a4df722722c8125ccf0e172a6cb420236436c8f37f2 SHA512 9a17707c485c3bb8203ca7daf50ed7fe36b08376fb454d3fef958dc86c10f2f898fc534b5366cf39187740d8ced3be456ad18af9da684ff7425339630dab920e
-DIST thunderbird-60.5.3-ca.xpi 591971 BLAKE2B c00610d637419eb909ed07fe0d87ebeba7aa03eece0c9b6cb8dbc5a8f9ffe34131858a6cbb07a124993f5d79be562fdd3e4be787bc150e379d32b9be5921a541 SHA512 39489e3a9c000572f8e7e36e2384f03169df30ea84dba5890260975cd99bc831f2cc9c2325b8aec64749b48f2ee8d08c803c8f637ed7ad8ed7fc70d6ce797b6b
-DIST thunderbird-60.5.3-cs.xpi 611203 BLAKE2B 0a331732009cddbaedb93d4a1cacee3762a562e18e542a442f55f3ae8ed6bedd59a5ce5b099f15e6a97b6baf05ec3c8a67fe2ada6ce4807e5da4df53124b44ae SHA512 d83e19d7a89ddc162fac3ebf71cb0c1213ed259788549fe3e75891eb8781304f9ed238e9b64133bc69d222f54b2ee4bdd7c5b4fe2eeabb98e8dc8bd5d1c93574
-DIST thunderbird-60.5.3-cy.xpi 586039 BLAKE2B 2e969443daa6ea9aef183ea46d53b1978d30712a6b85d73e796e2a94a06e6ffd3c2e99b7b9da49ebe84a36e1219bf37b408c071cbdd68cb9f997688d22e324e5 SHA512 9508ac8cac4c711bcaab9a41eebc4ac01c5fe09f2c501008643ae0b9df16fe9de0fb16a2a1362fb58732214232570f3578df6bab0cbb4a6e166e0dc92caf2934
-DIST thunderbird-60.5.3-da.xpi 570807 BLAKE2B 72f4956929d549e33cae9506de26bde8de814fef9ce04495137c2b443ef9f3cfebdca409d388652f69e5240c35b9b4e58a49c46221dec8ae1f610f4729db6e8f SHA512 c366a0d7940595c8b53e69ff961f5ed0580d291b89ecdc1db36ebd9da55153e951d790866a6f025e288856beda8fb43269d8576238a704bb651657af7ade6e7a
-DIST thunderbird-60.5.3-de.xpi 582575 BLAKE2B 5613dea86e8c725a33a2255fe1dee2f014bcd9b7f1a0828457d30293a23f5e4ca22c3398afbfba9dd9c64d9ed7bf2b6ac55dc77148b9ee53ce6ee11d23473caf SHA512 46c5405368ed6ed00c747a6449d815396a7fdae0bab5472e5b5c061acb3d8b5ffc7d08f776356a0b83bdddb77ed80bfb078253d5efdd56559838e11d4d90024d
-DIST thunderbird-60.5.3-el.xpi 694858 BLAKE2B 7a0e1af405d4cc43857aa5b23a002baf30914ed65ccee1fcc1b491c0f060a80cae736232f23504ed1a7eff53a11d1dabb4f7272fc4261ec7b791d993edc940a9 SHA512 fc9beb99c581aa381c4488c2e9396a429a3fde0407e8b2b4684182882c8b6d1551f73d0c7ba7d5c050bdee0d13487653d71a735a15ac158a0153cb82f81a920a
-DIST thunderbird-60.5.3-en-GB.xpi 553896 BLAKE2B 81669f96a10788f9a8a009d0390cf3b0dedab006d6ca3b8d6fa57d4e937386ec213dc83503d369e33e28ccb4f483821dbc1d6447009f7fdc43d6efca94d765ce SHA512 44de972f64b8c276fb1b23220666245611e771feefa37f5d293795ceca6bb9025345356ebd6d45eca4e306abfa7303404776cb4155d356af1dc4bceed282ccea
-DIST thunderbird-60.5.3-es-AR.xpi 595048 BLAKE2B 882a474d22321bece82642452f268d8c07dab7523be97551ad96dd7352ea10f1e4ac78e71b536dbda65a27fd60c14e08c1e3377838aaa8c8adfac7445b727b55 SHA512 154e2841e2c12df883ff6c381ba82b47c177c52cd831ff89d3ab809f88acc7125eb6ff7bfd4f39e7894e38b24d8992c2f174ae5b8710c5fe179ca73a6fe0e43a
-DIST thunderbird-60.5.3-es-ES.xpi 492212 BLAKE2B 50008d0c8f97e97c25f386c690ced14dce894122c41d97409c8875bf4979bf656d195ec3131f42e86c1ef0bbd8978c1bbd6cc118ebfa5372c1f893c60f31cdec SHA512 fa21fa829b64b7e68062b6c29d9a757f35d9e5be9272d772796a311576d792ea2af2e2f25e6cf81a246e6085c203c1e805e9d0dff1c6a78f498b31e17c1d2d97
-DIST thunderbird-60.5.3-et.xpi 570868 BLAKE2B a59cac3030f20345865ac1bef0a4baae8d69080286d5f24db4930c5866b235e6127d1a385510de4a10fed2fecbe0b7af74b3a505c32c24e150a5ab38703fe893 SHA512 f3df4657ef1d76c9469ee830f94aff0c0309952efad0f814755fc7fd758705b208371af15ded3b985e7555aeac4791730627cbbe719bbd9ee4350a4de88750b1
-DIST thunderbird-60.5.3-eu.xpi 581385 BLAKE2B cbe9c4b6aa8bad77a7508403944b14f4b3871641f3b0e67b892640f685389dca66d0cb99e07324eb51b2b0288987d9a8daca83fed923cf4b792a88f3c5c13c9a SHA512 33bb369235c458c468a1928d3c341f17a61965142ca7a47223e221dd3bf8162ef40349057204a05cbd7dc029529ad820beb58b70a75035680c61f82b0085a9b3
-DIST thunderbird-60.5.3-fi.xpi 575755 BLAKE2B a7de65dd9665871344dbdf524bd0b66180c53c2f0d097840d0be6d015bd23cae38c6afea5c04b94403bfb84bc66b372641aab78a52d6f8ac2a9008e47f991877 SHA512 76c150e0549b913fd76317664a4b1ef8d0ffc1ec15b03bf44244c70bf237f3540bb886ea481f02941a2abf7e04878923d6af008cd08b4894eb7a1071bafc6a01
-DIST thunderbird-60.5.3-fr.xpi 608466 BLAKE2B 9a60f7a16a43cadc2e6556ebaae404963feb5efe2a9183a40d60c04906ad95a7839895622d0be3920a203d29b026087d4a95987ba00776539ef4ac4773a071fb SHA512 a47d98577f346c02a178408b0c5fda39e28c09fd17da56275c1d83f8c2eb080d270adf4a7e14af71c3e9db917d201492819e679a089a08f16723934845fc53c0
-DIST thunderbird-60.5.3-fy-NL.xpi 593851 BLAKE2B 9bdecb6b31df3a896b2e0b07f0df6d75e83618a88a0311ff9e720c03fc16755b75201442791cc4fbf5362e798f59e6e6d23a8de7993aba9cee7326f2efa1274d SHA512 5b2c824da3bd80d9e900227e59e9e15d8de3c819deced24e163881082ce578f4f82c6fafb38c350f6f0a06375ac1ea1b0e04d45a3294619d24a14c26503362bf
-DIST thunderbird-60.5.3-ga-IE.xpi 603505 BLAKE2B 1fe6f120f1181900613db972e332e0b9249f457262ac4980059ef061e175e247ee0316776aa7e41fc1051e65cc63150f1b70d631d04d6af07b6f22e14a68e7fc SHA512 e8624d2dcc33e3dd4aa74bb51ec24f18f23fbf690b7eb147582394cb223d840cae05b8ade30dfb7a71cf08f17c7e73d110449c99a550089c1456086a731f0b7c
-DIST thunderbird-60.5.3-gd.xpi 599262 BLAKE2B aa206bcea3a21c5e487bf2f10dff0c47eb24dc56801aa56430802f952a63d8cc4f98580715b4071473df0041df97df626c704dd5a9c6954976a476f03a9471e6 SHA512 88aed8ee1748615bf217fa86c2454145bc12e1d433a10a2e0a7f47ad75251a9def540e4b419661ef987961992aa7bd294453ed222d0371aa4747efc79d9be823
-DIST thunderbird-60.5.3-gl.xpi 580352 BLAKE2B 4ad06648e88bf6d61932fb0c8703261a90e6590ef5dabd78a1d851c9b1379051aa6c3688be4fcf760909a3da663ab93e52d6f89d538b9fd6d4d507f664b0dd94 SHA512 206d41c81cef5a6388c4e9293affc7d29315db3ea96c76133cfce4a881e3a8e25582e917b2f0f42fc90a251df8dace46a85be732bc2736794983d28ddfd3e525
-DIST thunderbird-60.5.3-he.xpi 617144 BLAKE2B ac6683598fd25da35426268ccfad0fb651454aafd598fb584149ea7e53e6331d3f578bcff1537bd1cb023a3080568dde12544f1496509d78bcd393e9dc8e52d4 SHA512 72606b13bffa02aed21ca87043a72e8dededebca9045e51cbbe9fcdd378dc63e8104249c2e58562019322c0fb18a75b12b77aa3ada32874874653d60d419a896
-DIST thunderbird-60.5.3-hr.xpi 582239 BLAKE2B bfc325a8d466ad9252dc2b9caae78df8b68a5043f52297efb973732e9187605a8e17072bb36ccfca1349b7f1746249ccd79ee2e6471c99434e1c23b88877e8e4 SHA512 b4d417df37e942670354fe1013c56b2bd8bd24a65456293c21f9e1fadf1e24f2debc9f6ba74412726d59484fa9fde0ac9f3ab1c02d3c40b5c30c2a2af3e0f4e4
-DIST thunderbird-60.5.3-hsb.xpi 615132 BLAKE2B de2b4937fdb271865cfbf2f7c3d5d58e21264bf1dff866675b507a8f4bb964898ed78ca2e7ff7ec73fe7a2084c813fa833a49c544658c9a2334901829ba9942b SHA512 029c115e0fd733d6711e1de5faa6cc08823f581193fe6c3e08b1d3c9c03bd00a9f57726b862abcccc2d81d30ceebad7f2d4b806381d19c4183a98e4946b32d22
-DIST thunderbird-60.5.3-hu.xpi 615346 BLAKE2B 618357caf08541a98463fe28b1b15561a58c92192c24e4b0159c2677f5e01b393945c75b970699ae8bafae0ef32bc4efc1306a03e7c945a40e9d32f64071d63e SHA512 c911bf162971dd10fa644bc3df67dda6e58ca1b277e35c3491be8f52a177c8a0ece2944bb0357688f20c0597aa98584f79f237b5c73686162a7ddd0a5e0b2a57
-DIST thunderbird-60.5.3-hy-AM.xpi 653531 BLAKE2B 4abe52413106cfb6fb2077e65c631e689ab89e7d33cee27c407fb604cbe3975a9477e2d477dc553b2fe5eac3d378fe59a1abe456cfff9c6d935138199d99b79f SHA512 b007c0c8a9b792993f3eaaa0aa3dc875c245763b62e2ad0f1217b098057ac397dd415c29b5f1269d531dda9e3e0f7b998f10ca545ec1f12ab1074b1cf9b1674b
-DIST thunderbird-60.5.3-id.xpi 568861 BLAKE2B 8d2c50984cd6f6fa33f517fba151e5bddfa60218f7a6d13be651ffebc8afddf87a76a04ab7d71ca79588282e279cad3fa856176df4d92bb184cc589c83d4ef59 SHA512 8d8ca7af841b2d7bb69b95c425b8a94f8cb7ae896f92243edd788c21a45d0fbf08b462d7fb5bc017efa4b6e2254f06269b117abc8757b72c29bbcd027fdce0cc
-DIST thunderbird-60.5.3-is.xpi 579048 BLAKE2B eed2475a57873ed9cd078bd3d618e67468904f05dbfbb9106113537b5cdc374dad9641daad3c139cd51bd0c7f37857a9f58a83625f7bb350010e9fe790110596 SHA512 6249b0a56a73fb79f5886af127dc601e2a8b92d5afb0d57866a536d0e4b1686bc7ea71e15a18a76a1759885ffb31edf923e31dab18af36e710e128421af2856a
-DIST thunderbird-60.5.3-it.xpi 477500 BLAKE2B bb577887568e672d8c92d06cf9697aedd682883b6b6c7047845533a14a9ba13d37e685fac899758d0141136b3b76f797782d2db96e7a36e10202ff5c8c51dff0 SHA512 212c90e55a56f035bd38d60433b36a030b64572aae79d1755ef9c0884b7e071383fd1153c8ee64482e1e0dabf699ef52031ef6a722bcb160bad02d0edb789f59
-DIST thunderbird-60.5.3-ja.xpi 653345 BLAKE2B 55609176ab64d1de3a1dd5a0d26cef923fb42905d00fa9134bcc35c50b98d27a6c5472abcaf4c1272bc1ce64d7126206d40d9ddc3ac4890a337cdf0b3c96f2a1 SHA512 a0ab061dfbfe74a0709531b011f2c897625c6782601868ea12f8a85ca49615f83fb3dd5d1bed4363776e08664006e7239a0aa7c4699c5a74a7fa403a827d00d7
-DIST thunderbird-60.5.3-ko.xpi 619730 BLAKE2B 7c68c9921c125535c4de9abbf714a7dcd0ab52369a506734ed5f7253e14813adcd99a1e6861f56182b5214c63a1bbe52d7a6284713d789c7c5244c0d68cc7725 SHA512 2ef936ed6c1650cf3ddcd04d58462a4f13d0a492c32920dca2606ca6adf4d8bb78b8bbcbbc000e442e841a83e35c6ebe3e20536ca2c81d087bc5fb3f1b8c3547
-DIST thunderbird-60.5.3-lt.xpi 605442 BLAKE2B dc3076dd4869da8db04f0911f518af1c3f8d907f82bc86a51fb1d5ee701154db0d67dff945749788e5b97a5bd2f772602f7ce2f167582fdda4399ec56e99e84e SHA512 876e70411b5aa11f041b1bc8c8165263248978c2de24dc900ef89df7b862368b4d4d36fe08af0d91f0b90414d48b677fe477c7addd72b5a24ad0d0be305c5448
-DIST thunderbird-60.5.3-nb-NO.xpi 577003 BLAKE2B 58dcfa3106b47b10f7d95af8af688f7517d53325db7bd87221ceb69bf75ffe98ae2d719c6017caa477211ebed9e63d0368ce36f522c0cfa97c09c7bde105360d SHA512 a05d9e3911b7fad6b413cc341d13cbea442646d9b8ee07c61528d8682f345a08cb7295ac42cdefc25210e46b51a7086451bbacd0bf0ed4ea4d228d5928322a94
-DIST thunderbird-60.5.3-nl.xpi 583912 BLAKE2B d773069770bf0d20f8f8ab30329ea5803e3a66319f655c3c8b40058bd927bf40b495b13465ae130652a5d499e427eb6c78ad9df531b93e65cabf8e95178b9ae0 SHA512 52eb896e06672ce2a2b39c4d212c64bb9d5912bba3cb6f7d5e7b2ad7cdcad4cd6e2758aab8847e470c0ea2f8d02f2498d4bfed64094af3aedb599f94f54fe639
-DIST thunderbird-60.5.3-nn-NO.xpi 576422 BLAKE2B ce2e1361d30f7e69277328f822f2da5428d103003910df33e6a5d314ef0e4f5565804de4d0f9102545118099f22e60babfd865a89d666c14ae3babbfbb3d32fc SHA512 c214e5cbb314ba54951d7d6f9ef3c9342676f2485cefe1cb3aa2a0dac4b0258aa724eb3f2138c5a0243c8cdbc6369265d73417857a387e2fafc7bcfa87c9f54c
-DIST thunderbird-60.5.3-pl.xpi 480725 BLAKE2B 1b53c166476c94605131ce6f816e860ef574c25360ff0a971c0781dd28a71ffde3d272a41f908321d0ea8b6a78d00f453506964b79c0571728304c2651e9521b SHA512 0cc7e6b8d437d81c6448d815c028d8af4a5c8aa7f23f8d75c49e7fdc47672686c47889361db72fc6a301b7511e944fb45922182b01309de2e5d48617caafd982
-DIST thunderbird-60.5.3-pt-BR.xpi 588835 BLAKE2B caf4ed9eebb4e659375e74d1544283a51b9ff794f89ee979437f509c0806922f2038c99d8f0eccd718403280299aa7a72f8bd5d1a40f1fa5925edebef06dfeb6 SHA512 43a3379e062ecd06ad0a4ff8847d18626f334f9681ed60fa189d748307ad24b79c58d052c4f86c1296d117a2758701d27099fe28a2451e11721e645767ea67d6
-DIST thunderbird-60.5.3-pt-PT.xpi 593186 BLAKE2B 2870e5484619041676b94f672e6b94998f9b44855c07fe73ea27f5b362d9c51f4b605057909ffbc1802bfe3b47c1926940ccda6e49dec69f6d81dd131637cdf3 SHA512 13409903e2da5433461e81fa1354196b17180ea75d76924d9d34cf52c9cb15e1cc45e94357b936c9ffe8c140e81ff5153bfa4460e1cc463669f1cf7c9aeaabbd
-DIST thunderbird-60.5.3-rm.xpi 578384 BLAKE2B bff6310528b3d7d99103615a36c4e94fe0df33974fcd3c958463f1b32c59068e6b28e65a3c2969fd9b372abe109422caaadeebd6ac47cda2900eafd2cfdad16b SHA512 700ebd0466e7a82c85445b56cd8f6496b03d1f623cec9a2eff57d6cdca7dffe5d77102e5cde5707ade532a3c37899d0aac99b06f4da78aa5422ed333712407c1
-DIST thunderbird-60.5.3-ro.xpi 584309 BLAKE2B 631534a9321f4f1dc1e731f4013933ca68360cb251cbaf07dbccca2e4793b5e13c41fc95016d9cb52531d60ef9a42080c5887d264a11f309e91cc76519ec56a2 SHA512 913079718a98c4db8cabbf30dda7de4b95259b45926a07a76703b7a07649f176b6909f45d235fcd0c4c912629c3867bd559ba74f66d71aae174bc1c785c6df76
-DIST thunderbird-60.5.3-ru.xpi 694705 BLAKE2B 566c5950746274596cbbfb7e8f3eb6f63fedef91a39a3b97becc90abac28f97ac6194c9bbb64c7bc1eb7df6e818e124d56e58d8770731415835b697e1b86a4fc SHA512 89d276131c8bf95b67671c58aefaf1892faddc306a16f6dc656af4c33c80b5db87aaf229d99425d5f97561f2bf72788979d03e5b36d4dccac83678058d82c8fa
-DIST thunderbird-60.5.3-si.xpi 647592 BLAKE2B 213e0e20201758b7eb22fbd31f6bbd53eddabfc77b4ca1464cd96556f0e0793c7487aeba3b03cec45330d6d960b06b1744fd07a0869201f97194f0cb781a5b26 SHA512 457afd678e39f9f8062c2a26c6249d5be464116992080c2138528b02fdb1f0a5d141be1bd043a7866c2038ffe1146d31944a3ada836ce21fa22b904307107d15
-DIST thunderbird-60.5.3-sk.xpi 612218 BLAKE2B f281b2b86615530e396515efd1e88a3ebf83eb8a63692d2c06f21d7c91e238c6fe6069a521e47e5f3dd29f7c4b46f017cadc3e21563d38145ac1520acc13496e SHA512 3c3cdbb8f9fede704fc1bc445cf5129739e263a13d7f2c9a1171c7707a25f5079a941248ff3cc6a65e5177cfdb595e04b056bbde413ffc6225a945a18fe46632
-DIST thunderbird-60.5.3-sl.xpi 589947 BLAKE2B 1f75449b5b009965d4b378a19c3c981810bc8b9302e2098d0ee5341bb2073fbb8e6c8ba7320fd0ac07c5a927651d4ac0b6287ef6de4188aab96683473558da22 SHA512 1550fb8cafc7b6bf1ed1003324d2d6836253d7e42bbac697027a8e3bb8436bd2a176b4d0a832568aa2bd2e1a664a38d51d3bb36c22e219871caf9896299f3056
-DIST thunderbird-60.5.3-sq.xpi 593096 BLAKE2B 7d0bba5a472600b5204288c13a673e61f5e6b6bc9db0dd61c4f90ef8ba8907deac7e2bce5c7154a7d287e37f5187088ae2cf0a1f3f1f0a5ce70c0fee60ad8a8f SHA512 3bd718be055e53be9fea9a83039c1b6103b24911d0a5d3710723b64ea02c4acea349a1ad8319faf6451a55733190e4c2bd87f47358725d81aa20e77ead3bc86d
-DIST thunderbird-60.5.3-sr.xpi 641527 BLAKE2B e9b323b4ac9ed89913d364c000a504b0ba577940dffea6c30cc44f2089640e6af8acfc9bfe8af89bd6d49a7fa15bf801c343c07c0acba42ba7e8537f03edc1b2 SHA512 9eaccfba8a209dfb97cf6239422d9e12340bcb861321ed7f439f864d8834840d7e7e4f6664138ae79d4d8f865b5b72c5aec2a044aa2ab73f25a06fecd9b87d78
-DIST thunderbird-60.5.3-sv-SE.xpi 594079 BLAKE2B 668df08340d40fb6ac7b07c04b769db165996e92ef6e028357f2fb16bd695b77c820d47d11dccf4039d681033fe78699aa13042063f6be4d83201b5a50da4cb6 SHA512 5862c2736209128d2eb20b1cdc75bc1296aca3755685d962674c4e0a3b0b4441fc0f410da080bad85386474c5c1eac8f414d96fe2715343c81f3c4f18487a4e5
-DIST thunderbird-60.5.3-tr.xpi 598010 BLAKE2B 91225e58d72ff5264d13e6a3bd783ed907f7f067e9a9f7a34704d42b16f6ee596d93631cace8fa3536acaa820c826901108eb8e2e9e84c0210dd70c63b8b9295 SHA512 a368c162b19496e83a27c28161909b87e45d50a1faaee312a50ba0cd2e2380de1aa9c512d8d354cfe1972a3e2ced24d3aa62c951076a243336fbecf5b39778fe
-DIST thunderbird-60.5.3-uk.xpi 684155 BLAKE2B 079bbc16e8cc9fe64ad203d04b735a297724f55975cb4c62a78e1498f081300102907c06c3d9c3643cb6105ffd668220e6c678f05d005d292b95315a6d4401e2 SHA512 7e33ed75dda430329ea0014caa382e3f8e6c57593d2d2178bea8b14e5cc8d8df48bc7a29bc423e88bfba083d62c338a54b7a00a0ad6112861fdbfa7c4a6a5031
-DIST thunderbird-60.5.3-vi.xpi 637197 BLAKE2B aaf475ec7800c6ecd5d450c0697e6f9ef53c38a8c77ec21ff6a4637e3e496d34e671c51ff5e51b5b1f4cb88dd7afce090050c3e21c07bae7ad0f3e36d6ae4b68 SHA512 9ded56e89a932dfe84ce0505cc6f927dff4a106351483ee7ba309d45b4b663f508fd55c59b52869271798e78dfde907a4c38d091331ea1dfcdb709e4d9616934
-DIST thunderbird-60.5.3-zh-CN.xpi 626283 BLAKE2B e8f63b43a7060cd6a56696d38b7fd7a35311b015a576ce3e13dd5528cb97f914e3dbf393fe71d29f9d1355769e31b3190bb1e9584e8b9992163b24f122627b63 SHA512 a83c5e9de03027ee62402510daa6c7afa58af300b9b2605f840220ccd70361492011473f1b9b39d0162235471175c50b998aeb56649f087a87fe9cfe6225c927
-DIST thunderbird-60.5.3-zh-TW.xpi 626189 BLAKE2B 91175d151a1ae7f0a191c30b3e40ce47b2616fe7e3c8a9aaac1fb832b1dd29dbf74868015d909b17eb14356e69f80f94ed0a9126e9cdad640e571d7730a1c0f5 SHA512 a96dff2e5094746cd84ec9e14b88580fc3481a82d0f52f78ef970164bbd7093fef1eada4fb0a832397a39a98c7d4dbdac8a667e071483e36a5e888c0d6702158
-DIST thunderbird-60.5.3.source.tar.xz 284754320 BLAKE2B 776872c255fd204ad28d8cdbf4a57d822714c0ee041c824263427aa48a7780abbf0e707ded655ec29fdd3111e5bcfe6c1dc0263d9809191178ee86bec8def768 SHA512 0b647988e711be9a113b6c520d889200898a675391e61916a4d16578d5b1335263c9ebc623369b4f5160abf08fd1be5954ede42bc17f03f1b2937d8b9fd565c9
-DIST thunderbird-60.6.0-ar.xpi 627181 BLAKE2B c585cd5d66bfb65542b4e45669e30417d786713e2918ad205ab6224a6375697b8b66dc4e91a1b25cfbd9ba960e48b791c2dff79ddec3ebf7b062144a250df2a7 SHA512 ba9f97ef66105625e09a0ed7f4dc28af90d5b01981b2f980f6cc2e7c2520a3a660c70e9234a7f1ca2d428188eab2b93e0217b465d15d820c7f2fdf4bcc6cd5bb
-DIST thunderbird-60.6.0-ast.xpi 559642 BLAKE2B 0edfe183ab8af3e44a2ca4ad41bf98d5afb5570aa073675c9ef7af297dbe8c367dbff748a9b69b7a6f7b320bc8cef0c8f1ec54521637ccb9d3b17bf281896615 SHA512 3a346be489cec696787afce7ab8cddf7424e585afaf9d6b6dd8a92d6a2d7f729b2fbe7adf7cba63570b23941987a0ac160cc306a8f9326c84d5b9fa8042c7736
-DIST thunderbird-60.6.0-be.xpi 659078 BLAKE2B 4225ca50c9ddc590688ff94ea044c5b48a948ff97b4259cc25036a651f761a20c6f63c821409d477405fa5382740647580329cd735dfd416372a4afdaeecd211 SHA512 9d021963bbf56738629e46ea005e9f039b2a544df1b354529fb3f684cbdc026fc91a706a6465ecd0f2dab61dc3466e3262486e27c533d8be5ab565895538aab3
-DIST thunderbird-60.6.0-bg.xpi 669317 BLAKE2B c16781cd581166402bfffa03dccfac0643bc4b3d429c914b7c8a418b6a6e17af5ed828652775077eacd281bd75221d21c308e7a8d5ab8bce722143a802b98cca SHA512 1e34e49a865513c5b84b635db595b21aeb47f121d9a87292186160e9b8a3e1d0f4cea7cf006fc8242ebb9191b7b0df21716bb522606b434f83714a2d3dfec263
-DIST thunderbird-60.6.0-br.xpi 580370 BLAKE2B d1b92d4a9a8c1e6decba376b9a790526f989e1962aa737662cedcc80b6348b03d4cc692bf13d09255efee37ddf5ff82abfca88bbd26e0b9b65e2960e16bcd1ee SHA512 f4f68197b33ac3f0aeb73fba51445f37d3b05e3baaea336e1d51b912fa7e554b4314f04531cd1129b98db989cdd3263050397377e97c25448ebfd0e7aea46aa3
-DIST thunderbird-60.6.0-ca.xpi 591972 BLAKE2B 21ccfae5b17debad1e569f1105a11b9fb23138a84ec4501d5b39a4a01b8da1ab1a79a6894942f71392df614b4cd5556165aa230fbdabdf8bdfb74c4ca8e10f04 SHA512 d38c74fc9db2685a24a1e424d2365f996413f06fc37c45dc06655ab2a558a0427466bc98c868ddd1fde8ab305e5b2847464b60b06f0aab3b2176108dc719dade
-DIST thunderbird-60.6.0-cs.xpi 611202 BLAKE2B 70af45e3e710f23dd751c9a152ecba5b2f24e5ae7c0edd9597a2b9c876852e9fda809ff69f2bc9e6cca0eb33a64ca3661c8ed748ae8f219c59b9e65097fd3594 SHA512 dfcc19ebd5999497ba393a5c2555c1360ecac4dfd20a3d71b69060267fb5ad637a0d52a11238c224d021a512fc8259bdd494e52535e1f3dd7c10f4b9ecec8c5f
-DIST thunderbird-60.6.0-cy.xpi 586038 BLAKE2B 262c2025241e00ff404af9078a2e23b69318822aa4f2364c4814170f327385ac92a800fcefac456aae31ed158e6c7b3d46dfac72948c031ff4a85a3d181b4047 SHA512 dc2c91a9b61735955ac5576d79adc34bebabb2e8c69ea5e11d8d505575fafd662b19b7b599e42fd0a016d8572973e7d214c1eb32861e44c0d882a470a4e74f86
-DIST thunderbird-60.6.0-da.xpi 570807 BLAKE2B 40900dda7bc4a38990f2072c6e5f37ea950039e5a195909c34ed8d9372b8f902a796f76a17228d84abe607a2d5be038d9d395d300b646fa32fb0febeece41f48 SHA512 79e3a17deb707342590c0436ae95c834c8586e26290317449429f8fd16fd1b538365a1732de32c933a01b36ec225d8c145e55b5c3b8a8c42a5c96e22374fd6b8
-DIST thunderbird-60.6.0-de.xpi 582574 BLAKE2B 661a85856271ff2768458f515c674c065715d41d81ee7555ca9b7000831d5b97c8a1118ad0aaec3fd586e040493d47cbca02cc16b625224a2dde42e0daa89bae SHA512 d1039dcef888c70d4034a0ef3fcb11a885faaa739d6b87d50678f8712d3cd52343879809ada1b67b8deeab3099e2a1809ed36e803acf0d5ae27c01223b856bc1
-DIST thunderbird-60.6.0-el.xpi 694860 BLAKE2B 9a8b86c8de3f7bbe786d339dc4e3c22b8b03e03a356790ef55f02248109c131eea565ecdb0b473024e5d8e61256cc8a9420ecf5141d908a2d44b69f8f5d53cce SHA512 cf881e6dae0f8086ab14668aa10440479a17c5587daf6551f23e0661ef3936875fa50c3808d81c39caa37cb3be8d548d2a5e5c50bb10b36600c2781fcb1d2dc9
-DIST thunderbird-60.6.0-en-GB.xpi 553896 BLAKE2B a4f48bfbf5b511244ae281cd6fe64ac1ef97c483b18007381345302a40909c904b21ca6084cc06b7aa0fbebc73327bb4a12125bc0fe7f35f30d1aa1e82bbb3d8 SHA512 3309c420af7f9c2f85e9825ae52d420cd15a92bf839ca1fa5a01b6f371760c49b955643fe1b5cda89dd2b97a1b000e15ae68067f40b3834f3427c03c6630e8e3
-DIST thunderbird-60.6.0-es-AR.xpi 595048 BLAKE2B a09060c29ff9db4c486d5be975d233011882c4c86accd9dbf9078f0aac98cd214f8bfdc7cbd5a35cd1771a9e6d8b76cf983e4725215d585f588ebd4503ee6270 SHA512 a30271630543716a444e6bd04c5456f2e528339f54cf972e87d3b93549a291c450b0f6002f68dec8e4047c20247a093cae544e9ce3e93010b9b81c5dea4df477
-DIST thunderbird-60.6.0-es-ES.xpi 492212 BLAKE2B 47ff76d1becf9660ddd783e8ecbf8044e23e3a44855e053a1af93dca510dd641fe1ed383720783614c3ab5443645153539ce690cbc6b737968c304cbda88c88d SHA512 cfb1bb66c9a0fcc6f4de5b3abf9fb1deb0055031466494cfbc9d028b0612e4861f0b7fe8b97089b0cd84305e36769b7d231401a86011c1cfeab11ce1930b1ec6
-DIST thunderbird-60.6.0-et.xpi 570867 BLAKE2B 820d6fb13b722507717f002a5ec33ce5099163898be263b5c5e344553c044a7ea8ce9cb9d0337eee849a55bc4499f87c40d4049031727d99861fe3d922ecac3c SHA512 70ad0f3878e863a5e8ce083a80477c474e56281becbaff9ff06b0ab1300e6c76e00e1df848d26aee28f9362986c6354371a00cfab7fe9156e10fbbaa48e62737
-DIST thunderbird-60.6.0-eu.xpi 581384 BLAKE2B 024ef5cc4c05820963448c980dfaa17a77a0e2bcbd21a86683a3490ae98d6e0fc39c2d61eefd12156222429c695fdf59784ebcc9f7a7f8a31d233876e6afa540 SHA512 c63ddc1633d6ec5c3449b8866328c3a83e08b8f60dd813d28d530b3d266ea05f10b37e1e471e1711f5ad92fa1fdca9131b878af9f474344e6635e05d180f752b
-DIST thunderbird-60.6.0-fi.xpi 575755 BLAKE2B 599f982add19a1f08891382024ae2a60b7c15323517233bf34508355f67284dc6da03fb146f1acb72540e537ba36e79d82d6d7528c5ffcd25e412f9214a1c7b8 SHA512 4591076c09832d014fae5e5e5f19441205210cdf0a79f37aa953c2c57b274a47d22e9edbf363a3a0b955f2a124ebdbe84687a3e021f237ece6f75fb60fb9a23b
-DIST thunderbird-60.6.0-fr.xpi 608466 BLAKE2B a47d1d3b186c887c37ac378a3d75578e57de23bef642268257a178da2c5015350f4d7638f342562c01b8432276ef5e8e3f34dd201693f58bda814421e1bfefdb SHA512 a9ecef839f36f0e727d6869e5fde626233006b10288ced723f04afb121cfb665a2f0be9e5cf5627a24c2ea462b145413b50b5846d488f2d4d683d182297c7f61
-DIST thunderbird-60.6.0-fy-NL.xpi 593850 BLAKE2B a27edf042c71c40c580a0af14f23f129024f1a766199a554c65f3b72e8c21711b76fb764be58265c067fd1351aa1e98c4601a3b3be42043e2b39a13629eb7e7f SHA512 257cb678ffb82494ace62610ee1d04ad058ddc8829a332b78549ded939c9bbc8b18e14d8f2f88b936b68c7215c3add921542482a66f69e0487193b3bf0ed7bbe
-DIST thunderbird-60.6.0-ga-IE.xpi 603506 BLAKE2B 2b47fe28c3df1491f9a89bba8495b0eb06c1607b0ae22bd099cc50cf029f5565389f70be6362fc5e8235760d92f385074719129a77c82167a08be81c876a8f24 SHA512 b323e791ae498f7759827b68dd611fdbc854f9a82046bec0eb6c54bca616e63b40c3c89a2effc3f764b3c14e7b497f2e285b81d166a958477e24a6d3a994a19d
-DIST thunderbird-60.6.0-gd.xpi 599262 BLAKE2B 8d64c0a03d34d6f6317b100c4fbdf146a64190092af0e92efc5d3f8a561c5eb74707d7256eb23caa4e79c3b9cc41ae2c2f5ba169d325cfb2e8cc248b7707e00a SHA512 13daa6b8341d852242f4de5161c4d5489673f90c5f081ae1d8b21305dc76b6e9c5832c6bafb6606f443717c5e8b6ede016c0bdca0db8d7967b10d9a98bdaf528
-DIST thunderbird-60.6.0-gl.xpi 580343 BLAKE2B eee56a5c30fbec556ad8ed307f7f309016de86f310ae3a2975008cc3ce228522acabaa3525b4152f6a7c1e1676454d25d9585db14e10722915e391813715c362 SHA512 6584a2158f4ac39d0c2d106ea0b054f01c41b66175c1b0aceab78afb4fa5304f37bcd44115082b56ce90b3d6f7b52cf48a5d8e625ec229e6e374fcee0c20d872
-DIST thunderbird-60.6.0-he.xpi 617142 BLAKE2B a6e8e7e885081a537ffbafa4690056f43c21a3b3939ea2b3e7b9d84fc705aa856e2d76396ab5f6c85a6cf2fdb91229aa7134ba95108cf2ef77402c92fc3387eb SHA512 50856a82f1f5685614b278d388a98d68a3a67f048c759ac489e6e1e5f080cc7127098882a03b7c0eb9fe4142d42c354ce52ff59a44193d912fe91890bc041b4c
-DIST thunderbird-60.6.0-hr.xpi 582238 BLAKE2B 6c870dc88b243b016b095a250f898e65df668502ef95e9dd3af2ba2efaa5c9f8fe9bdd4f591cf762fd2702aaa09e6760da79e957f481d38cc2904d3837dd9c85 SHA512 ec556a6971ffa85f50ac7c15748cf0a5b7d0e1abd3ed9537a58c227ebd9f9bc32aa57c000c9f09b2a37aa740e037933e482ebfe01d3d3d703ce2e318a88f327b
-DIST thunderbird-60.6.0-hsb.xpi 615132 BLAKE2B c4df0247dfb7c0c7feded2037512c2c9c7f0233abc02c160e81ed3aeba98667c7445f05e8d4e02c1764b21361b43ab41626ac7cdd7fd9cef524ae3e7846bf10a SHA512 67762a239d8552e51916155fc517db77c395480c3afb12468da1a2396c269f609c926a595783369ed07f8f57ac3fbfc3960c6e1c4b41634f25b56d119181b795
-DIST thunderbird-60.6.0-hu.xpi 615346 BLAKE2B 0824c1feb3ebfd5fcafddb16d05dc25cf62940ed8a9112dc0a55ce903b61568dec0f79f4f6d9352867405af44f7b38430333affdccde95eb098d3b5d7db6fd37 SHA512 0dc3c78135ca472ab76c7c84d0ee8beeaafca4caeec7c5951a99169203f2d3f309c7f61a3f5e5989874d21888e6bb67401151a32258cfb46f63e3d08c7bd925f
-DIST thunderbird-60.6.0-hy-AM.xpi 653530 BLAKE2B 2b40de78e0aba1a1a78f4a6b620f3f825c547c810fc5f5c750edc20732e321c0c7a031900973bc861fc0d39bb46566ecaa56f21d1582c6e9dabefea33c30ccd5 SHA512 f8102c3ed19d0aa558a4f4fa06add1662429b22fda49ab7f129a1ecc11fdfa531bf78aa3dbad38be62d485140b4e28438527cae1faec8ca55470cff8e8b94cce
-DIST thunderbird-60.6.0-id.xpi 568861 BLAKE2B cac1c08f8381ad3b638425cf5bd091c28c34d1cd9ac22a8f11f3b4a34b148f990788299322ddd55d5125d731af47c89a42840af1c10f0529ed1f68a982a9c6f0 SHA512 3c08bc7b4542c6369b115cbace8fa32068c8e1eed3dbe8132dc965a252fe6567c4b2568f92a1edb8cd67ba101db40888b335a79883fe9124a81a8d3c501e0823
-DIST thunderbird-60.6.0-is.xpi 579047 BLAKE2B b5517ed864d5ae4e971df3decaa086a40f46f23f6ae4d13d9d70e0c0d2b31b0c1a698b8f11a5bba93c37d3a94f51c017de356f2d3d60530e5024dd753c484672 SHA512 6c909ad4494c94a7b6140a540ad0d62246dd2e293f13e86c9de9c93733f3487eec9963770e702365b996e6cd62d520cc80f8ab1ae0565fc0eae26f8b7738cf42
-DIST thunderbird-60.6.0-it.xpi 477499 BLAKE2B 7488d160d41bc4f74e61e2fa8b9f94d2309c529c2ef071428455ef7f00a43398020256d4610727898f2e438d27f10d7286aeb2cfc4a3371709879d1f63017a19 SHA512 814b68ff056116afee57eede618fcc29ee64273ce17c987240c8320eb76ffc6a173b52a413c46363e356ecc18038abfab6bfb37866680093e49ccbebaf32a2a4
-DIST thunderbird-60.6.0-ja.xpi 653343 BLAKE2B 26c024f97f5703623db0fa6fe9cb33a6b2d52b1ab2fd2cd05a0187ea3936be24ecdd137c39decb9c12edd4cc5f5898671d41ed6954880c9f897b05915463dac5 SHA512 299d9a3623e545f30d1b896c854cb7a0635ef5f865fc1326965bc6c28ebe867a84d9591703cb741a43320464e648331bf16a29228823aa78660d7a2bb0f055e9
-DIST thunderbird-60.6.0-ko.xpi 619730 BLAKE2B ccbd7005c5c7673bb6e9c35f6cb3a46656f1213771f7b70d821c8a47f2d372acd9cf0f73b8cf158a91d39845ebf83780fbc8bcdea2e2bec9f9e588828653a8e4 SHA512 213f7f4efd94d650d0249bfdf1e2941ea8fd9c665590bc00cd98a87274b912313948691c41289ed8c98562c06c97f869895cef2323da2a894f70b062870b9e6a
-DIST thunderbird-60.6.0-lt.xpi 605441 BLAKE2B 6413a36788f4ac9fc057354049e3980d68b10cd7bfc2b2d8b2d52039d93ab20dceebefd5bea0958146678657553b63069bc5e3122e5eb0a78226992f83e9ba69 SHA512 a66676e5711bae0dee141a2415cb46940fa21c78ca0a284fa278bade8be5dd3198568f5a43b6b1d89886fe63a3ef283c31f0bd4f87e8d8c520f9c5292a857063
-DIST thunderbird-60.6.0-nb-NO.xpi 577003 BLAKE2B 6d65bfb9ee786816545c117efa1a03f09e72cc28dc315c137c1e0ee7c681d1fd21fd854874fcbfd115f18a573b1298389ad6a332d68b9eb5f06512097b9a0cd4 SHA512 0924ca3cb4b267667a9c8aee18cfdf5fca5917fdf341ef985aaccedc4ed2c76a25df573a03bd2dc043e87bfd7c86a7b9a0aed1a2774c7350f67efb68d58281de
-DIST thunderbird-60.6.0-nl.xpi 583913 BLAKE2B c3c146f7f106f79c0fba1c83d9c1a7bfc20654e8a96d4c53f5e06e73538e51950d451a927241be42aed8c1b9f6e698d8ae29f1e620fad8737c40209a9dc600c3 SHA512 223a9d97811c3fb962b7278cbf1da34c72c65c2f40993ce717c0bcaf3b4131e1f9fdea49e99f73953f12c57653820cdce4821431e1ec3d9fc05710f7d42999ec
-DIST thunderbird-60.6.0-nn-NO.xpi 576421 BLAKE2B c77072c8d1618593203f3322cb9b9c20abf35333bdf9824899bf9124ebe04174c3fabc5d173eaa115eca13f7c33597c913fec77e8f69c2389ac519bcc150d822 SHA512 0dbb8464afa2cf274436c6a9c9a910553df07ff1ef1f1437aac5d421b6d638e546b24067112eecb1b44275ef37c6c485279872c16a9c231598aec45670c84a85
-DIST thunderbird-60.6.0-pl.xpi 480724 BLAKE2B 40966f339f4d069cb0367dc2c47a7255a4d01af2405a6964d77d34abdb4e6b5c51d45804b640ea954fad6f73f860949c6a250992680ff81d918ebc01eb4bd044 SHA512 eb3972945c2240a90dcbe4a16c5bbf2ecd5c5dc0deeffdd379a43d2b384d50c9aab5e736b77d17aabc220d12d1ba167f5577ffae08bc4cc7842aaf82125214b1
-DIST thunderbird-60.6.0-pt-BR.xpi 588835 BLAKE2B 58fd6a0dfd14d815a5ddaf253db39bbd45e2bc18ed984a0f95f57b8db3916bcf85ae9b28c512eae354f8d7a06b22ac565430818f936d7e31a8226ca71844b766 SHA512 d5fb2d3209321ea7e2d7d1373841308ceb9bec00209f8fd8bdf6cb0441667c3e51fa5d53ba111497b0e29acb80a122688899180fae803046b4c19be139d409e9
-DIST thunderbird-60.6.0-pt-PT.xpi 593186 BLAKE2B f565efe3c4820bd0130b47cd96666a2ea5aead93c03ecb2e3e9773f3db33325762567dd21d6a404cf94c52a2cab73c2095f5b296bc238d33af4f4d73284a92df SHA512 bb1acf531d5b528ae8323e666366d5fc073684356fe6f95a020d1b92241eaf90ba6978e44ea2fc682cd6157b78e5af11e79f9687d4cbcf930e39883bd28ed27b
-DIST thunderbird-60.6.0-rm.xpi 578384 BLAKE2B 803f5fae3b8cd3949a207d74eaf9b6c91d2137ee5ac750421495bdf8702e76dee3ce2432982a56008ad7ae796f214e7436009f18ad891716d7d71b2669c90be7 SHA512 8825fb746d5db6457ec55ecc86051ab9f9222c841214528afe6c2db34eac5f25f86af74b19e78a655eceffc5762948dce41337967156bc919ebce720f037de62
-DIST thunderbird-60.6.0-ro.xpi 584309 BLAKE2B e277f61feea84b4a47af09bdbc7be7358f4cccc28f6f406520be88de752e7f67a5d1adc4358c8b6eba362394476d9e4003ab8281e74a1b3e6168fd6ffdbc6335 SHA512 9875c7c2b9bda6c331a2adfe1df84a9781bb086f8b0ecdb6814ca5368b827fd4daddf332e405d091ba5ee05d9fd1f793d5b34dc36e82635c84a45e62d59dee48
-DIST thunderbird-60.6.0-ru.xpi 694703 BLAKE2B afb1f1d275496023b525bd1c11192a7fee859c0867e581d44a7742d76a0b8310aa87bd357fda5dbd7e1c771dd87f013d3eb3ed75fb2acd3cb8ed19eaa3247e82 SHA512 13819fc13bf813d1d2c37d82d996da0fb7926a937233256ba2b9c7fd05f2dd87ca418f725f2cb02bf4963dfca61fdf6a9e5cfbe78442a953292baac3706a1eb7
-DIST thunderbird-60.6.0-si.xpi 647589 BLAKE2B d0492d43eb8c0e70a1284b8ae714c6ed69cad23c41fd997c872e5011f7f5cb363f517555c68bd4f54b45e6d6ed374afb9b5b196da1da3a77f227f3dfb3b17f23 SHA512 6085a7620dde9e1d74a5632a0e2395b8e29f3edf6caba14fb6e29be6b135b2b12e3bc6c24e2117ac1b2d944796454764e1672a438162ad5464fdc30f81d63273
-DIST thunderbird-60.6.0-sk.xpi 612217 BLAKE2B 0743557d1b0628fdbcc46d290668a7b68a672c38fd6e61e597fda5caa41f38448f6b9595448201a75052cd0956bc545849c72007c03f53e126623c58a1f5a0ab SHA512 028f925a2ebce0376a2bcac4a303d484d7c4d90609b9ad4c3e050dfb36ff3db2a279f593677851441a931f05649427d888359d2db570e553ec6b85a223cfe54f
-DIST thunderbird-60.6.0-sl.xpi 589947 BLAKE2B 103f87c770d98f1988f33398f6e7ac2745595f04da218516a657d7c4184ca79ee3b0ae82af3dd75dc94303b4a514252e86abe91d27fc13938dcf57f884452e8a SHA512 03c7b5b9b78ba5b2fc1ee462759fc1baa9dd4c297041245485aadd3b72d712414f1c5e8a206e248bb3f85eece40bdd1d920d7953b653c7117ddc14a7eee80f47
-DIST thunderbird-60.6.0-sq.xpi 593096 BLAKE2B 3a1e691f4bfc04a8bbdf8422ad681a3fa5f67694d20ce78cc37b980c5db723df47b5a5385db65fc56e700990cd092808b29829ff404e2dfa869195fe57e02f8a SHA512 b4549a8068d95d68fe3731e8d6bad6195cf0e9e9b76f86590024292e00c86a84620a6d9d668ae7346bb577b89d68e25da71da1ac6be53426bce346056878c0fd
-DIST thunderbird-60.6.0-sr.xpi 641526 BLAKE2B 8b150d470d81e93f8f4a0e2da90e26f7bf121270978b172b0cb214ed5cbb8629069339d55a988897b9996b299d86104cbcc8619489b751c5679a34956769f5ae SHA512 278b6433b482c330413c09d96f7db1a266d1b9fe542bdeec38ea8a869df8cc1fda5cee4eadcd3f08ecc5d75bcf7a798fbea27c9811e641d79617eb90e36b75de
-DIST thunderbird-60.6.0-sv-SE.xpi 594079 BLAKE2B 1e908341224ac3e66259126267ba8e787311f6d6475e52d57707a7578fe3b2888a92caf90a5cb6bd0d2241d7d2e5a1df72761c160d947daf87517096a87d2abb SHA512 e73cd3b112009602256175fce80365d2b4b6e7d6bb8a6f8f610c9ceb813f01b77e1d93c96d8e9038f5bca1a05db2bf1eba3af5d4b0986ab76d3e106407ce282f
-DIST thunderbird-60.6.0-tr.xpi 598009 BLAKE2B e3fb35970ba351b3f53cb2a3a3c4db0a15fbe3f2b86fc5772396dbb52406d6706bdf15a16f5e404f32dc666da2781e73005d3115471c5eb230520497f03bbd14 SHA512 14702339a33b48d7848f094567d7a6ff1a524509ee686cbb67c584ecdcb2598119fb17ec1f964e23f7699a642a06b12d5c6fbb202d1bf1548786a752048bcdd7
-DIST thunderbird-60.6.0-uk.xpi 684154 BLAKE2B ee0f23423afe1f71f544f564f7e7443cba33b3cddc49da6ff8b2da3cfe99dcdc516be40c68d37fc0ac941d5a0d5772d434e63f8274e3a0f7a1b32e9a7bb3fd62 SHA512 208ae4cc607e61518896bd5d581affd669ad7fd4c5096aa7fbebc6d32bcf01e67ef2e2d225313b1e076457e790a2c0b7b239197bbeb15a3cb0e0e8f7f25d2d3e
-DIST thunderbird-60.6.0-vi.xpi 637188 BLAKE2B 821bf465db8c1a9b2bc51f228eb9da730c39817e6a1a0aabd797166ffb7e9979f107421744f730a2c75c4dafc3579814e1ce6479eceecd4a9e8c3afec690de36 SHA512 8ec6900bb557bfc7a3571da7f48ef5a02c1afca7ca75c9e9cda03fc206bb361e2e02349c96e9f0d2722eb1c03a3c89cfd4f7d19563dded7a7403ffb29ffe971c
-DIST thunderbird-60.6.0-zh-CN.xpi 626283 BLAKE2B df4c88ed96d047d4f84c4f9cf33ef24a425910c12113e1879dc89786d1339642cfd74b82998440b9fd3ba369db8d3b896d55db17d5df7681745cafc508e3f944 SHA512 af85c5d2232adc97e3f69d84bfa445d4debc477e515c9678babbaea9698adf30dcebcb549c71bd03a211354c8d4297a93014fec8f6f6604667eb254980ef2b40
-DIST thunderbird-60.6.0-zh-TW.xpi 626189 BLAKE2B 76b7accaf02882e17118291a0e1c97d3d024df311f2cd2b7e9f9fb0620cce9b1508cc75ccf01652fe0ce2afa0f01b42deb8310ee0aea554154b257cf7e977616 SHA512 6f93daf1adfe1056d9032ed0990ab979a37cff0028aa7a6ed523abb7da949a308d793ed108d529da1e8484404e1cd324dcd2f78e8133fae196235b07d77270d6
-DIST thunderbird-60.6.0.source.tar.xz 285222616 BLAKE2B d49882083ffbd645f97373e36227529fe053d7a88b130f7a16cc6b42dcdcf2bca3c6761493dbb9fd264a243e797361d54b5d3af8cfb1839ef36b43c958e10c53 SHA512 9f58ca34b7b1ea9643db1bd3f370176d9439a38db5aec41b68e118041f6c5cfbc94750ac1b8333d2e20d2f376fb97a0c97deadc87a597896b24cfdcce31b88b4
 DIST thunderbird-60.6.1-ar.xpi 627180 BLAKE2B 56df555c0681214450a28d1eb126a1e0ebad308049c2f64480dbf20f39b5e62ea5600ecf81052a2c13396044ce77c6d27ad0c1fb6453c329968ccfb505de16a9 SHA512 76a92d776fa1efd6db1a312ad6ca016ca1cd2b70eb62ed3e309417ee02a2fb78112295d58a0d1e092cf1b36440339643a3c290dd1098c6087d08fa39515157b3
 DIST thunderbird-60.6.1-ast.xpi 559642 BLAKE2B 77892bbbe45a04c60e62a01ca98f47aac139f282a5ac06eea62d2ce518ac6cbc8d6c3765d16f929c8792b5731feeb82491eeeeeba0ef6d0116442f1e569c0d51 SHA512 66130b52317bce1b92ca6d1922d56c062196bdd5e158239640e1d040830b5522227f13e86b1286f6ebf569a8de5491ab37b4e8d7af7c5965b2a7e5b14509235e
 DIST thunderbird-60.6.1-be.xpi 659080 BLAKE2B bde346f25b24c2253c7c4ef034dc8ffa1d3b742254db95a0baf9dc2a00fdd27a22f9dd7e6d32ff288ac87e6302193f7e7e1aff0e76dcff0b64ef6b9acd6093f0 SHA512 95a8afbf179697f819704668951907709033bb10d7212e7b6741910b39960a7c9800e70f343022185d716ef689c1c43e10718d5245c64db4cb5fb128a3b641df
diff --git a/mail-client/thunderbird/thunderbird-60.5.3.ebuild b/mail-client/thunderbird/thunderbird-60.5.3.ebuild
deleted file mode 100644
index 4454d8b2a5ab..000000000000
--- a/mail-client/thunderbird/thunderbird-60.5.3.ebuild
+++ /dev/null
@@ -1,602 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHTB="thunderbird-60.0-patches-0"
-PATCHFF="firefox-60.5-patches-01"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
-	selinux startup-notification system-harfbuzz system-icu system-jpeg
-	system-libevent system-libvpx system-sqlite wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.34:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72
-	)
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-1.4.2:0=
-		>=media-gfx/graphite2-1.3.9-r1
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? (
-		>=media-libs/libvpx-1.5.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	elibc_glibc? (
-		virtual/cargo
-		virtual/rust
-	)
-	elibc_musl? (
-		virtual/cargo
-		virtual/rust
-	)
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)"
-
-RDEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.9
-		)
-	)
-	selinux? (
-		sec-policy/selinux-mozilla
-		sec-policy/selinux-thunderbird
-	)"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-llvm_check_deps() {
-	if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patchset from firefox to thunderbird as well
-	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
-		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
-		"${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
-		|| die
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${WORKDIR}"/thunderbird
-
-	# NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
-	# check on lightning version or changes:
-	#
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	#local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
-	#if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-	#	eqawarn "The version of lightning used for localization differs from the version"
-	#	eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-	#	eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	#fi
-
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Avoid auto-magic on linker
-	if use clang ; then
-		# This is upstream's default
-		mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-	elif tc-ld-is-gold ; then
-		mozconfig_annotate "linker is set to gold" --enable-linker=gold
-	else
-		mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Stylo is horribly broken on arm, renders GUI unusable
-	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
-
-	if use clang ; then
-		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
-		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
-	elif use arm ; then
-		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	cd "${S}" || die
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/mail-client/thunderbird/thunderbird-60.6.0.ebuild b/mail-client/thunderbird/thunderbird-60.6.0.ebuild
deleted file mode 100644
index 2b695022bfb1..000000000000
--- a/mail-client/thunderbird/thunderbird-60.6.0.ebuild
+++ /dev/null
@@ -1,602 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHTB="thunderbird-60.0-patches-0"
-PATCHFF="firefox-60.6-patches-01"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
-	selinux startup-notification system-harfbuzz system-icu system-jpeg
-	system-libevent system-libvpx system-sqlite wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	>=app-text/hunspell-1.5.4:=
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.34:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? (
-		>=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72
-	)
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-1.4.2:0=
-		>=media-gfx/graphite2-1.3.9-r1
-	)
-	system-icu? ( >=dev-libs/icu-59.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? (
-		>=media-libs/libvpx-1.5.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
-	wifi? (
-		kernel_linux? (
-			>=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	elibc_glibc? (
-		virtual/cargo
-		virtual/rust
-	)
-	elibc_musl? (
-		virtual/cargo
-		virtual/rust
-	)
-	amd64? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)
-	x86? (
-		${ASM_DEPEND}
-		virtual/opengl
-	)"
-
-RDEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.9
-		)
-	)
-	selinux? (
-		sec-policy/selinux-mozilla
-		sec-policy/selinux-thunderbird
-	)"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-llvm_check_deps() {
-	if ! has_version "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patchset from firefox to thunderbird as well
-	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
-		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
-		"${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
-		|| die
-	eapply "${WORKDIR}/firefox"
-
-	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${WORKDIR}"/thunderbird
-
-	# NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
-	# check on lightning version or changes:
-	#
-	# Confirm the version of lightning being grabbed for langpacks is the same
-	# as that used in thunderbird
-	#local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
-	#if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
-	#	eqawarn "The version of lightning used for localization differs from the version"
-	#	eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
-	#	eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
-	#fi
-
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	# Avoid auto-magic on linker
-	if use clang ; then
-		# This is upstream's default
-		mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-	elif tc-ld-is-gold ; then
-		mozconfig_annotate "linker is set to gold" --enable-linker=gold
-	else
-		mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	# Stylo is only broken on x86 builds
-	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
-
-	# Stylo is horribly broken on arm, renders GUI unusable
-	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
-
-	if use clang ; then
-		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
-		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
-	elif use arm ; then
-		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	mozlinguas_mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	declare emid
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	cd "${S}" || die
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0579e0aa83aa..02be2394fabc 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/asymptote-2.48.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
similarity index 98%
rename from media-gfx/asymptote/asymptote-2.48.ebuild
rename to media-gfx/asymptote/asymptote-2.48-r1.ebuild
index 3941b97d6155..6a39f53426e1 100644
--- a/media-gfx/asymptote/asymptote-2.48.ebuild
+++ b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.4-r5:0=
 	>=sys-libs/readline-4.3-r5:0=
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8 )
+	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 8febbdc91223..5ea4db7b908d 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,3 +1,4 @@
 DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
 DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
 DIST DisplayCAL-3.7.1.4.tar.gz 10478572 BLAKE2B 9f646caea40a22804877f168c2a88a2b3069b8d0e4688c9676bd4d6d873a3528797dd3aadde26da40a4945e224504b2f8673f0c176ced687747ef23d8ca20044 SHA512 d60a240714cf32f1f8084caf74cbccc613263612b7192ad766216ec8253c5682079f32d9cf501e91bf7795ddcce4d9f2f0b023117719d0cc05f203d51dc3ef42
+DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612eba8c257b5abd8a4632f13d91285283d870d928ad3eb17a9cd620b7fed4b9e5414495e12227fb2b94e3da2551d14042bd SHA512 f516376a84680daa2baffa0b4738f52e5dc6df374ae5d97ed385430e2744a087e044faa4929fdc84b01d79878b44e15eda5fa75b40b8a78e6962f66fc06876d4
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.2.0-r1.ebuild
@@ -0,0 +1,64 @@
+# 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 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/displaycal/displaycal-3.7.2.0.ebuild b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
new file mode 100644
index 000000000000..d6063154f815
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.7.2.0.ebuild
@@ -0,0 +1,63 @@
+# 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 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch
new file mode 100644
index 000000000000..265cdc7753a4
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch
@@ -0,0 +1,11 @@
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c
+--- a/sanei/sanei_pio.c	2019-03-01 10:44:36.723260142 -0600
++++ b/sanei/sanei_pio.c	2019-03-01 10:48:47.660693036 -0600
+@@ -73,6 +73,7 @@
+ #elif HAVE_SYS_HW_H
+ # include <sys/hw.h>
+ #elif defined(__i386__)  && defined (__GNUC__)
++#include <sys/types.h>
+ 
+ static __inline__ void
+ outb (u_char value, u_long port)
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index 84029550db4e..66591b118f08 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
 	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
 	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+	"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
 )
 
 QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
@@ -115,7 +116,7 @@ src_install() {
 	if use gimp; then
 		local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
 		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"/iscan
+		dosym "${ED}"/usr/bin/iscan "${plugindir}"/iscan
 	fi
 
 	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
new file mode 100644
index 000000000000..2928247e57a0
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
@@ -0,0 +1,49 @@
+From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 25 Mar 2019 21:16:41 +0300
+Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
+
+Basically, the patch mimics this Qt's patch that has been
+added in Qt 5.12.0 only:
+https://codereview.qt-project.org/#/c/239918/
+
+BUG:399696
+---
+ libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
+index 4f5a58f..0a26655 100644
+--- a/libs/ui/input/kis_input_manager_p.cpp
++++ b/libs/ui/input/kis_input_manager_p.cpp
+@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
+ 
+ bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
+ {
++    /**
++     * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
++     * the tablet events be accepted by default. It meant that no mouse
++     * events were synthesized, and, therefore, no Enter/Leave were generated.
++     *
++     * The fix for this bug has been added only in Qt 5.12.0:
++     * https://codereview.qt-project.org/#/c/239918/
++     *
++     * To avoid this problem we should explicitly ignore all the tablet events.
++     */
++#if defined Q_OS_LINUX && \
++    QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
++    QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
++
++    if (event->type() == QEvent::TabletMove ||
++        event->type() == QEvent::TabletPress ||
++        event->type() == QEvent::TabletRelease) {
++
++        event->ignore();
++    }
++#endif
++
+     switch (event->type()) {
+     case QEvent::TabletEnterProximity:
+         d->debugEvent<QEvent, false>(event);
+-- 
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
new file mode 100644
index 000000000000..dc65b1c49d23
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
@@ -0,0 +1,38 @@
+From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
+ <griffinvalley@gmail.com>
+Date: Sat, 30 Mar 2019 21:47:37 +0100
+Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
+ 5.12
+
+Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
+
+Trying to paint with a painter that uses this while opengl is enabled
+will lead to a crash. The only relevant place this enum value is still used
+is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
+
+Anyhow, told the smartpatch to use this function instead of doing something itself.
+
+The whole thing is a little bizar.
+---
+ plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+index 656ba38..32577a3 100644
+--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
++++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
+     Q_UNUSED(converter);
+ 
+     painter.save();
+-    painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
+-    painter.setPen(QColor(128, 255, 128));
+-    painter.drawPath(pixelToView(m_d->brushOutline));
++    QPainterPath path = pixelToView(m_d->brushOutline);
++    paintToolOutline(&painter, path);
+     painter.restore();
+ 
+     painter.save();
+-- 
+cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
similarity index 94%
rename from media-gfx/krita/krita-4.1.8.ebuild
rename to media-gfx/krita/krita-4.1.8-r1.ebuild
index 09ab5c97fee2..46926f21e6a8 100644
--- a/media-gfx/krita/krita-4.1.8.ebuild
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -88,7 +88,11 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
+	"${FILESDIR}/${P}-fix-pre-5.12-tablet-support.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f1e5ed395832..8610ad8209a2 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
index d39e3f05a318..dff600917b05 100644
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ b/media-libs/libXcm/libXcm-9999.ebuild
@@ -1,49 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/${P,,}"
 fi
-inherit autotools multilib-minimal ${GITECLASS}
-unset GITECLASS
 
 DESCRIPTION="Reference implementation of the X Color Management specification"
-HOMEPAGE="http://www.oyranos.org/libxcm/"
-[[ ${PV} != *9999 ]] && \
-SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.oyranos.org/libxcm/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="static-libs X"
 
 RDEPEND="
 	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXmu
 	)
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
-
 src_prepare() {
 	default
 	eautoreconf
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with X x11)
 }
 
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 7bbefc2b77ed..6ab5f5bcf2df 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1 +1,2 @@
+DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
new file mode 100644
index 000000000000..7babd84b0d7c
--- /dev/null
+++ b/media-libs/ming/ming-0.20181112.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PHP_EXT_NAME=ming
+PHP_EXT_OPTIONAL_USE=php
+AUTOTOOLS_AUTORECONF=yes
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot
+
+EGIT_COMMIT="50098023446a5412efcfbd40552821a8cba983a6"
+
+DESCRIPTION="An Open Source library for Flash movie generation"
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+perl php +python static-libs"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	media-libs/freetype:=
+	media-libs/libpng:0=
+	media-libs/giflib:=
+	sys-libs/zlib:=
+	!media-libs/libswf"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+PDEPEND="php? ( dev-php/ming-php )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests only work when the package is tested on a system
+# which does not presently have any version of ming installed.
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
+	sed -i \
+		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
+		perl_ext/Makefile.PL || die "sed #1 failed"
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die "sed #2 failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# build is sensitive to -O3 (bug #297437)
+	replace-flags -O3 -O2
+
+	# build python via distutils calls, disable here
+	# php is done in dev-php/ming-php
+	local myconf=(
+		--disable-python
+		--disable-php
+		$(use_enable static-libs static)
+		$(use_enable perl)
+	)
+	econf "${myconf[@]}"
+}
+
+run_distutils() {
+	if use python; then
+		pushd py_ext > /dev/null || die
+		distutils-r1_"${@}"
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	# some parallel make issues on flex/bison
+	emake -C src/actioncompiler -j1
+	emake
+
+	run_distutils ${FUNCNAME}
+}
+
+src_install() {
+	run_distutils ${FUNCNAME}
+
+	emake DESTDIR="${D}" INSTALLDIRS="vendor" install
+	einstalldocs
+
+	perl_delete_localpod
+	find "${ED}"usr/lib* -name '*.la' -delete
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index acff06942a81..a684a06d0161 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 818ea1de684a..19cf4f05cc84 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,4 @@
 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
-DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f SHA512 0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4
-DIST ffmpeg-4.1.2.tar.bz2 10687366 BLAKE2B c69cc693078f40610c4414f01ed20f89a85db398b3177d8d79a6f58f2d48b6a8049a2bc622933e0ae0a2889f635c25ccf1c5856cb86a4d98bb0bc2308188ae86 SHA512 6c3bf20d46772a80299c9d385919a745e4022c0a9b3c438c0504d3c94bb8d472f2c9026105330fa7c50c2f23f511eb853f32e4387f73c0b7b0d0761c20cb8b31
+DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild
deleted file mode 100644
index 22bb5b192043..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver multilib-minimal
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_PV}"
-FFMPEG_PV="$(ver_cut 4- ${PV%_*})"
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz
-	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] )
-	libav? (
-		app-arch/bzip2[${MULTILIB_USEDEP}]
-		app-arch/xz-utils[${MULTILIB_USEDEP}]
-	)
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
-	"${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix
-	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
-)
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-src_unpack() {
-	default
-
-	if use libav; then
-		# Use newer version of bundled FFmpeg.
-		rm -r "${S}/gst-libs/ext/libav" || die
-		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf # remove with a proper release without build system touching patchset
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf=()
-
-	if use libav; then
-		ewarn "Using bundled ffmpeg copy as upstream dropped"
-		ewarn "the support for compiling against system libav"
-		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
-
-		myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"")
-	else
-		myconf+=("--with-system-libav")
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror; verbose build
-	emake ERROR_CFLAGS= V=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.2_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
similarity index 100%
rename from media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.2_p20190329.ebuild
rename to media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index ff636bc0e06c..4c43f48925c7 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -4,3 +4,4 @@ DIST kodi-pvr-vuplus-3.18.1.tar.gz 163398 BLAKE2B 30cab3bcd9e0750c116f2e95170fd5
 DIST kodi-pvr-vuplus-3.19.0.tar.gz 168331 BLAKE2B 141de1df21ae4149be56be3d952edd15792567aae39b337671c8f53cf28b1208dd69993a3680deb25b006b1d92eaa1a5b151ebc394f84d041d7cf99e56c206a4 SHA512 3a59aa691b0982cfbae466a3fa148a9ab71c7daeaeff1b91fdb71da4fbb406a6fa0346551bf7da37a4ba4dd6c1f58a2a3e41b0533b69afa4e28ecdf52be0029c
 DIST kodi-pvr-vuplus-3.20.0.tar.gz 172198 BLAKE2B bb68f6de811e14e38b0a804ed1db01e64df7d9c8e2c5ad6b31e07188f571418ec1ab8289056a0480b7aeffdd39bb8668c5ea0493ac0688e665c02994da9e53d1 SHA512 e30edab00ff0396ddd4021dc5a9ac8a0199d2535449385ff130572387fc1f01e128fd1f1a9b5cacea22de4789b1220b9ad0202a9c8086618fc2e35ef053dae19
 DIST kodi-pvr-vuplus-3.21.0.tar.gz 176202 BLAKE2B c51ff08e110748757aa56204af837982744fc49189a9fab762c49722fe760e05bd77d23e876dda831a63196c27994737a0f1df97d1e00f58a9824b3c8bd54a74 SHA512 480ce345619f68bdce6402b7f0f1291c41d3b2cd1cb868fba4540f60e45cfc5e80945e2394b5fac65bddc4ee9cb6c56f95f1563bc7230efa38521aa0c35f1946
+DIST kodi-pvr-vuplus-3.22.0.tar.gz 184305 BLAKE2B 58d865950a7f24bf44293ff156a3cb481fa16946a2c9489b46969dfaaabb26fe2af4fa3eb1462bc3f34000944a0aee0ac8bd274c7da2f4b00349db31cb78695b SHA512 bc75644e0a64e68564c29b15924d6f7dd5f45eef6f72b7c6a72609e0c18d4b2773452882af39674861ac515317511b281b832522c4657537675afc6ae5531644
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 80bc7c6cfbfd..65ec87e48b80 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index 771bf3e83a70..741682ebf20c 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="audacious doc gstreamer nls"
 
 RDEPEND="
-	~media-libs/libmp3splt-0.9.2
+	>=media-libs/libmp3splt-0.9.2
 	x11-libs/gtk+:3
 	audacious? ( >=media-sound/audacious-3.0 )
 	!audacious? ( dev-libs/dbus-glib )
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 58e3c10e0a20..88d0bf3cc76c 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit multilib
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="flac"
 
-RDEPEND="~media-libs/libmp3splt-0.9.2[flac?]"
+RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 6e60fc99ec5a..c76b3209bf9a 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,4 +1,4 @@
-DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d50d7a4ed349d0c2c61cab1c6e519da96f552f38692bedf18ffbdb2032ae0a3314a05b2f2461c2da526f85e5 SHA512 b3a938f43cd554e0e761890ca7ea910e21b8f98f54f5bfceb0efcbef4df46db0d110d1bbc24a233021b463e3424d6246c1013f5a6ebdfc85a418008d49ced7a4
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
+DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
diff --git a/media-sound/mpd/files/mpd-0.20.21.logrotate b/media-sound/mpd/files/mpd-0.20.21.logrotate
deleted file mode 100644
index 55694c4531c3..000000000000
--- a/media-sound/mpd/files/mpd-0.20.21.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	weekly
-	delaycompress
-	compress
-	postrotate
-	/etc/init.d/mpd reload
-	endscript
-}
diff --git a/media-sound/mpd/files/mpd-0.20.4.init b/media-sound/mpd/files/mpd-0.20.4.init
deleted file mode 100644
index 0a4c61677bcb..000000000000
--- a/media-sound/mpd/files/mpd-0.20.4.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: CFGFILE=${CFGFILE:=/etc/mpd.conf}
-
-depend() {
-	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
-	config ${CFGFILE}
-}
-
-get_config() {
-	x=$1
-	test -e ${CFGFILE} || return 1
-	sed -n \
-	  -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
-	  ${CFGFILE}
-}
-
-extra_started_commands='reload'
-command=/usr/bin/mpd
-command_args=${CFGFILE}
-required_files=${CFGFILE}
-pidfile=$(get_config pid_file)
-description="Music Player Daemon"
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	kill -HUP `cat ${pidfile}`
-	eend $?
-}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
deleted file mode 100644
index a4f1962c0a1b..000000000000
--- a/media-sound/mpd/mpd-0.20.21-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-	webdav? ( curl expat )
-"
-
-COMMON_DEPEND="
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp:0= )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable webdav)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-boost="${EPREFIX}"/usr
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.21.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.21.7.ebuild b/media-sound/mpd/mpd-0.21.7.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.7.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 32c52125a422..f5c7770182d2 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit autotools git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-EGIT_REPO_URI="git://repo.or.cz/ncmpcpp.git"
+HOMEPAGE="https://ncmpcpp.rybczak.net/"
+EGIT_REPO_URI="https://repo.or.cz/ncmpcpp.git"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4ec3224099d2..722228ea90d3 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 3d4464c989fa..fcbfb2a2dc80 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,8 @@ EGIT_SUBMODULES=()
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell +uchardet"
+RESTRICT="test"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
 # Unfortunately, luabins upstream is practically dead since 2010.
@@ -46,11 +47,6 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? (
-		~dev-cpp/gtest-1.7.0
-		dev-lua/busted
-		dev-lua/luarocks
-	)
 "
 
 REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
@@ -58,7 +54,6 @@ REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
 PATCHES=(
 	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
 	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch"
-	"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-support-system-gtest.patch"
 )
 
 src_prepare() {
@@ -103,7 +98,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake WITH_SYSTEM_GTEST=$(usex test)
+	emake
 }
 
 src_test() {
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 5c68972a6417..3a1f794053d2 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,2 +1,3 @@
 DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a3e02b1ef15b6ff742687efc70a3e3f0ae8124ed2226a1cf00022c7ef0650c8e1c1b6e3279b111891e8c3e651e SHA512 0581fed93d2a09a3d9ec9cf1bb68a298ccd47676b22d0824495136ee9d785290b8465af8c12b5ecd34a46936f7433bf96dd559e6252a8f1af46c0e2f9256c864
 DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
+DIST parole-1.0.2.tar.bz2 915511 BLAKE2B e6fa116cae5c015a90b4a1d04df70f006ad59dfdb5d849b8ae8c3fdc0665e48790739c82bdb7c35c70f34548b9bee3dcac62f29e28562663d46b10a3a080f13d SHA512 d7e989af7f9dab14080e62bd656a2858d8536a056ba82b5d5ac7d26a7d898f478b74c1ba4371779624691b7f42b695580ad53cfb15da0a4dc209d7570c12a66d
diff --git a/media-video/parole/parole-1.0.2.ebuild b/media-video/parole/parole-1.0.2.ebuild
new file mode 100644
index 000000000000..f14dfea94f96
--- /dev/null
+++ b/media-video/parole/parole-1.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A simple Xfce4 media player using GStreamer"
+HOMEPAGE="https://docs.xfce.org/apps/parole/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	sys-apps/dbus:0=
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.11:0=
+	>=xfce-base/xfconf-4.10:0=
+	libnotify? ( >=x11-libs/libnotify-0.7:0= )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+DOCS=( AUTHORS ChangeLog README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		# clutter backend does not work with new GTK+3 versions
+		--disable-clutter
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3a239f3643a9..d12199ecf730 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d5ac72ff4a72..73017742061c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Apr 2019 18:08:44 +0000
+Fri, 05 Apr 2019 13:08:44 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 91c7580233b5..c193a1df00d8 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-201904-09.xml b/metadata/glsa/glsa-201904-09.xml
new file mode 100644
index 000000000000..1f133aea4a5e
--- /dev/null
+++ b/metadata/glsa/glsa-201904-09.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201904-09">
+  <title>Xen: Multiple Vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Xen, the worst of which
+    could result in privilege escalation.
+  </synopsis>
+  <product type="ebuild">xen</product>
+  <announced>2019-04-04</announced>
+  <revised count="2">2019-04-04</revised>
+  <bug>679580</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-emulation/xen" auto="yes" arch="*">
+      <unaffected range="ge">4.10.3-r1</unaffected>
+      <vulnerable range="lt">4.10.3-r1</vulnerable>
+    </package>
+    <package name="app-emulation/xen-pvgrub" auto="yes" arch="*">
+      <unaffected range="ge">4.10.3</unaffected>
+      <vulnerable range="lt">4.10.3</vulnerable>
+    </package>
+    <package name="app-emulation/xen-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.10.3-r2</unaffected>
+      <vulnerable range="lt">4.10.3-r2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Xen is a bare-metal hypervisor.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Xen. Please review the
+      referenced XSA security advisories.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced XSA security advisories for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Xen users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.10.3-r2"
+    </code>
+    
+    <p>All Xen pvgrub users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/xen-pvgrub-4.10.3-r2"
+    </code>
+    
+    <p>All Xen tools users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/xen-tools-4.10.3-r2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://xenbits.xen.org/xsa/">XSA Security Advisory</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-03-28T03:48:31Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2019-04-04T18:34:06Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d5ac72ff4a72..65b9fa6158fa 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Apr 2019 18:08:44 +0000
+Fri, 05 Apr 2019 13:08:45 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index c5e0ca87f2ee..8bf01aa3c270 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-30de0bf9ee6986a07eef489491b435e55fc9cafe 1554179778 2019-04-02T04:36:18+00:00
+7c09f6fddfb8f5996646e8bceb05ce66a9df690d 1554402888 2019-04-04T18:34:48+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 2dd9e27f4986..4300e9aa83bc 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 4ebe65d51d31..ed4722627913 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.16 b/metadata/md5-cache/app-admin/ansible-2.6.16
new file mode 100644
index 000000000000..b90b0ef9dd12
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.6.16
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.16.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=89537dcbd618e096076d591a4b964045
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.10 b/metadata/md5-cache/app-admin/ansible-2.7.10
new file mode 100644
index 000000000000..11366ba18576
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.7.10
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.10.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=67995b60d4280a20412aa086c7710c36
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index b0953746964f..ff2516e32caf 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r3 b/metadata/md5-cache/app-backup/tsm-7.1.4.4-r3
deleted file mode 100644
index 822d0b54666a..000000000000
--- a/metadata/md5-cache/app-backup/tsm-7.1.4.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
-DESCRIPTION=Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API
-EAPI=5
-HOMEPAGE=http://www.tivoli.com/
-IUSE=acl java +tsm_cit +tsm_hw
-KEYWORDS=-* ~amd64
-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
-RDEPEND=dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java? ( >=virtual/jre-1.7 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/patches/client/v7r1/Linux/LinuxX86/BA/v714/7.1.4.4-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e0ec72ab9b9bd03c37be647129297bb5
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 6ce696189070..47be983d0415 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-0.33.0 b/metadata/md5-cache/app-crypt/acme-0.33.0
new file mode 100644
index 000000000000..3ff8f0942f2c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.33.0.tar.gz -> certbot-0.33.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=09b718243d1537e68d315d235e53da7e
diff --git a/metadata/md5-cache/app-crypt/certbot-0.33.0 b/metadata/md5-cache/app-crypt/certbot-0.33.0
new file mode 100644
index 000000000000..91307afe3127
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.33.0.tar.gz -> certbot-0.33.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=8c0b31dd46500dca126d2bdb4480fc21
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 42aa744f7b39..353eb72fd501 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=39bda50210d3d11ea5313c75c0332142
+_md5_=8c0b31dd46500dca126d2bdb4480fc21
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.33.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.33.0
new file mode 100644
index 000000000000..23c5896a492c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.33.0.tar.gz -> certbot-0.33.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=fe3860197642473f3cf912e280a3ca7a
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.33.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.33.0
new file mode 100644
index 000000000000..d99ef6895e3c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.33.0.tar.gz -> certbot-0.33.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f987368191c11e0225917eacfb99c6ab
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index 775ce0c731c8..7558137be2d4 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e9fd865ff1bc54077e7647b69b87ce61
+_md5_=f987368191c11e0225917eacfb99c6ab
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f95607472451..54d61a320215 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/latexila-3.22.1 b/metadata/md5-cache/app-editors/gnome-latex-3.22.1
similarity index 95%
rename from metadata/md5-cache/app-editors/latexila-3.22.1
rename to metadata/md5-cache/app-editors/gnome-latex-3.22.1
index c13c158ef8a6..7228d59cb767 100644
--- a/metadata/md5-cache/app-editors/latexila-3.22.1
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.22.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=|| ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.18:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) app-text/yelp-tools dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Integrated LaTeX environment for GNOME
 EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
+HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX
 IUSE=+introspection +latexmk rubber
 KEYWORDS=amd64 x86
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=|| ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.18:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/3.22/latexila-3.22.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=077a917c66cdf6df1e30d6e305d1934b
+_md5_=918a2ba12ef5f8d60ec2cadfb1fc4e28
diff --git a/metadata/md5-cache/app-editors/latexila-3.24.3 b/metadata/md5-cache/app-editors/gnome-latex-3.24.3
similarity index 95%
rename from metadata/md5-cache/app-editors/latexila-3.24.3
rename to metadata/md5-cache/app-editors/gnome-latex-3.24.3
index 50f9715b366f..d9fe66a9e032 100644
--- a/metadata/md5-cache/app-editors/latexila-3.24.3
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.24.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=|| ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) app-text/yelp-tools dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Integrated LaTeX environment for GNOME
 EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
+HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX
 IUSE=+introspection +latexmk rubber
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=|| ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) app-text/enchant >=app-text/gspell-1.0:0= >=dev-libs/glib-2.50:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtef-2.0 >=x11-libs/gtk+-3.20:3 >=x11-libs/gtksourceview-3.24:3.0= x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/3.24/latexila-3.24.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2010838eda2af221c6fd0653c913f1e3
+_md5_=e19b733ab0121b0ab2537d5826da35c8
diff --git a/metadata/md5-cache/app-editors/gnome-latex-3.28.1 b/metadata/md5-cache/app-editors/gnome-latex-3.28.1
new file mode 100644
index 000000000000..35936577a5b7
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.28.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+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 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 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated LaTeX environment for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX
+IUSE=+introspection +latexmk rubber
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=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 virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-latex/3.28/gnome-latex-3.28.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=707ae0cbf61bf1069ddc9e47bfff09e4
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.2.0 b/metadata/md5-cache/app-editors/notepadqq-1.2.0
index e03b436ba317..d97058495c0c 100644
--- a/metadata/md5-cache/app-editors/notepadqq-1.2.0
+++ b/metadata/md5-cache/app-editors/notepadqq-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5 dev-qt/qttest:5
 DESCRIPTION=Notepad++-like editor for Linux
 EAPI=6
 HOMEPAGE=http://notepadqq.altervista.org
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.2.0.tar.gz -> notepadqq-1.2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a954f3123be99c1cf5ad84a3d6e5b48b
+_md5_=9aa04f7d818a2453f26252a285421f8a
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.4.8 b/metadata/md5-cache/app-editors/notepadqq-1.4.8
index aa9436341613..2d6ad8b9038d 100644
--- a/metadata/md5-cache/app-editors/notepadqq-1.4.8
+++ b/metadata/md5-cache/app-editors/notepadqq-1.4.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5 dev-qt/qttest:5
 DESCRIPTION=Notepad++-like editor for Linux
 EAPI=6
 HOMEPAGE=http://notepadqq.altervista.org
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.4.8.tar.gz -> notepadqq-1.4.8.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f7d82adc0816d23e3bf62cae0164f708
+_md5_=2f47521c514e61b9168b29522c5205fe
diff --git a/metadata/md5-cache/app-editors/notepadqq-9999 b/metadata/md5-cache/app-editors/notepadqq-9999
index fc1129b84b22..9c11cf98d8f3 100644
--- a/metadata/md5-cache/app-editors/notepadqq-9999
+++ b/metadata/md5-cache/app-editors/notepadqq-9999
@@ -1,11 +1,11 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5
+DEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtsvg:5 dev-qt/qttest:5
 DESCRIPTION=Notepad++-like editor for Linux
 EAPI=7
 HOMEPAGE=http://notepadqq.altervista.org
 LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5
+RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=be995b650e2156a5ae3e5b1a0844f169
+_md5_=c73ec348fefd48e77d3be335bb61926c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bfad57825f5a..f5ddc0891324 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.21.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.21.0
new file mode 100644
index 000000000000..497af3005db6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.21.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/networkx-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.21.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7c6a84322fb2c13b6886648467d996aa
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.9.0 b/metadata/md5-cache/app-emulation/libvirt-4.9.0
index 42f797cd3617..e652944c2874 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.9.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=6
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.9.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4768648495b20bbd5bf2b530b0462dcf
+_md5_=e7ecfb5ef8ec7b1be7d39d81a8861146
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.0.0-r1 b/metadata/md5-cache/app-emulation/libvirt-5.0.0-r1
index 7d1def4cf645..deff3d523f77 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.0.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-5.0.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/5.0.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.0.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=8f394ac022c619180fd41e7de2ab5be3
+_md5_=6181506a59c8d1c619c1eb92a2d0529c
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.1.0 b/metadata/md5-cache/app-emulation/libvirt-5.1.0
index fa267a26a89d..8a3a02ea3d28 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.1.0
+++ b/metadata/md5-cache/app-emulation/libvirt-5.1.0
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/5.1.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.1.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0fee41a1f04a81a9e9ec8f46f896e682
+_md5_=e6b23da137adcd9c5ff34cef59df9df2
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 77128c7a9693..3a9120c0436c 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup test unpack
-DEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub 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-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=93e262ab6af0c38c1d6f93fc1eae91d9
+_md5_=a6f586fe958c0b46d80cef69fc041b1f
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.0 b/metadata/md5-cache/app-emulation/xen-tools-4.12.0
index afcc773d6726..f7a57e9f1a53 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.12.0
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.12.0
@@ -10,6 +10,6 @@ RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/
 REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.12
-SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.12.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-16.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-16.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-16.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-16.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=bff8548afcbe73fc2f99e7666a4460f6
+_md5_=92c14e3170e8f54c10d5be7715182729
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0256ec1dfdc8..51fe3b6d5d4a 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/skim-0.6.5 b/metadata/md5-cache/app-misc/skim-0.6.6
similarity index 97%
rename from metadata/md5-cache/app-misc/skim-0.6.5
rename to metadata/md5-cache/app-misc/skim-0.6.6
index b6760f60aa93..f1fbee6f9a67 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.5
+++ b/metadata/md5-cache/app-misc/skim-0.6.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-SRC_URI=https://github.com/lotabout/skim/archive/v0.6.5.tar.gz -> skim-0.6.5.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.6/download -> tuikit-0.2.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+SRC_URI=https://github.com/lotabout/skim/archive/v0.6.6.tar.gz -> skim-0.6.6.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.6/download -> tuikit-0.2.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=2becda80d622a090a8c208a5883f9ef2
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 107b873c05f4..697ef845f8c3 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.25 b/metadata/md5-cache/app-text/ghostscript-gpl-9.25
deleted file mode 100644
index 4797809ea105..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-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 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
-EAPI=6
-HOMEPAGE=https://ghostscript.com/
-IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=AGPL-3 CPL-1.0
-RDEPEND=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 ) >=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
-SLOT=0
-SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/ghostscript-9.25.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.25-patchset-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=710a402b0b4432a5e2c383bf90593b0c
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.25-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.25-r1
deleted file mode 100644
index a27cdd93c427..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.25-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-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 )
-DESCRIPTION=Interpreter for the PostScript language and PDF
-EAPI=7
-HOMEPAGE=https://ghostscript.com/
-IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=AGPL-3 CPL-1.0
-RDEPEND=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 ) 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 )
-SLOT=0
-SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/ghostscript-9.25.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.25-patchset-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=cb49f134796eda1a744d11349c9fad3e
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3
deleted file mode 100644
index e55f15bae4e6..000000000000
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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 ) dev-qt/linguist-tools:5 virtual/pkgconfig
-DESCRIPTION=A tabbed document viewer
-EAPI=6
-HOMEPAGE=https://launchpad.net/qpdfview
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-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 )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cc511dcf892f036237da44940e33e565
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre4
similarity index 66%
rename from metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
rename to metadata/md5-cache/app-text/qpdfview-0.4.18_pre4
index 003477477ebd..66d648351243 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=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 ) dev-qt/linguist-tools:5 virtual/pkgconfig
+DEPEND=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[cups?] 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 ) dev-qt/linguist-tools:5 virtual/pkgconfig
 DESCRIPTION=A tabbed document viewer
 EAPI=6
 HOMEPAGE=https://launchpad.net/qpdfview
 IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
-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 )
+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[cups?] 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 )
 REQUIRED_USE=?? ( fitz pdf )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre2.tar.gz
+SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ca051361bc4aa1d77bbec3fe74f10b5a
+_md5_=51add0c7d931dd6aa024f7d9189137ed
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a7821262664b..5d97659b6faf 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.7.1 b/metadata/md5-cache/dev-java/boot-bin-2.7.1
index 6353c031bd3e..8513e41ff6f3 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.7.1
+++ b/metadata/md5-cache/dev-java/boot-bin-2.7.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst preinst prepare setup unpack
 DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Build tooling for Clojure
 EAPI=6
-HOMEPAGE=http://boot-clj.com/
+HOMEPAGE=https://boot-clj.com/
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=EPL-1.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boot-clj/boot/releases/download/2.7.1/boot.jar -> boot-2.7.1.jar https://raw.githubusercontent.com/boot-clj/boot/2.7.1/README.md -> boot-2.7.1-README.md https://raw.githubusercontent.com/boot-clj/boot/2.7.1/CHANGES.md -> boot-2.7.1-CHANGES.md
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=45bb8a800b80fc38436c1df18902999c
+_md5_=e85768f52cf7b00c7ab56e2c9343323b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 6a83e876db77..741fa5a02bd7 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
index d784e47d7d37..75dcd1319763 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ b/metadata/md5-cache/dev-lang/polyml-5.6
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads
 SLOT=0/5.6
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=e05c9500294a4bc63ba7765ea0f58a6c
+_md5_=c6c40be35501478aaf6514d2d862928d
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.18 b/metadata/md5-cache/dev-lang/vala-0.36.18
index 86af33da0347..4850379cddb0 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.18
+++ b/metadata/md5-cache/dev-lang/vala-0.36.18
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-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
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.18
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.18.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=88d7df44afd5d10bb1557a644f51695c
+_md5_=c01ed7b86a15dbbffc4edb438fd3b6e2
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.14 b/metadata/md5-cache/dev-lang/vala-0.40.14
index 603f15ade0c7..d51bcce64672 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.14
+++ b/metadata/md5-cache/dev-lang/vala-0.40.14
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-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
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8a06746e4f3971c6b8b06a03713a41a7
+_md5_=c486b850c0beadb6f29bb7165310a1ed
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index efdc1f3410ae..d2193404074f 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0 b/metadata/md5-cache/dev-libs/apr-1.7.0
new file mode 100644
index 000000000000..72a802b9cb2a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=7
+HOMEPAGE=https://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
+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
+LICENSE=Apache-2.0
+RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
+SLOT=1/1.7
+SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=8ba0af5e85ac20807d88d902e6446469
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index 0fde1208eb14..363765992389 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=virtual/pkgconfig
 DESCRIPTION=A loop generator for scanning polyhedra
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.bastoul.net/cloog/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/isl-0.15:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/cloog-ppl
 SLOT=0/4
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5685fe72604fcc2d58fa81bdd894c3a2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=c473c73144188688f12f6fab19695690
diff --git a/metadata/md5-cache/dev-libs/isl-0.21 b/metadata/md5-cache/dev-libs/isl-0.21
index 5a1dc93448df..8e4793b5a259 100644
--- a/metadata/md5-cache/dev-libs/isl-0.21
+++ b/metadata/md5-cache/dev-libs/isl-0.21
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst test
 DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils virtual/pkgconfig
 DESCRIPTION=A library for manipulating integer points bounded by linear constraints
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/21
 SRC_URI=http://isl.gforge.inria.fr/isl-0.21.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72cf3953628ec4dd9a3a6963736a70ec
+_md5_=1baa40e7e1dbbfa66e6f47284ec364ae
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.20190404 b/metadata/md5-cache/dev-libs/libbpf-0.20190404
new file mode 100644
index 000000000000..c06bc54e6fb9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbpf-0.20190404
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/libelf !<=dev-util/bcc-0.7.0 sys-kernel/linux-headers
+DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
+EAPI=7
+HOMEPAGE=https://github.com/libbpf/libbpf
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD-2
+RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
+SLOT=0/0.20190404
+SRC_URI=https://github.com/libbpf/libbpf/archive/7c27c6306160f630c3c4f4b4971deb657126d681.tar.gz -> libbpf-0.20190404.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=95be3679b03035480ca89cb3c11c423b
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-99999 b/metadata/md5-cache/dev-libs/libmaxminddb-99999
new file mode 100644
index 000000000000..04ff138594cd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-99999
@@ -0,0 +1,10 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare unpack
+DESCRIPTION=C library for the MaxMind DB file format
+EAPI=7
+HOMEPAGE=https://github.com/maxmind/libmaxminddb
+IUSE=static-libs
+LICENSE=Apache-2.0
+SLOT=0/0.0.7
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=3ceddd081ef10d9444970e39bc1c4fe4
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
deleted file mode 100644
index 80fe36918b61..000000000000
--- a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=A library for Microsoft compression formats
-EAPI=6
-HOMEPAGE=https://www.cabextract.org.uk/libmspack/
-IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=utils? ( !app-arch/mscompress )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.6alpha.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7851baa6e7025955a496fb59193fffb0
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
deleted file mode 100644
index 3f19fc3dc27d..000000000000
--- a/metadata/md5-cache/dev-libs/libmspack-0.7.1_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for Microsoft compression formats
-EAPI=7
-HOMEPAGE=https://www.cabextract.org.uk/libmspack/
-IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=utils? ( !app-arch/mscompress )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.7.1alpha.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=866eb0bf75f270590a08cef87b2af14a
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.8_alpha b/metadata/md5-cache/dev-libs/libmspack-0.8_alpha
deleted file mode 100644
index fc0fc8d5b117..000000000000
--- a/metadata/md5-cache/dev-libs/libmspack-0.8_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for Microsoft compression formats
-EAPI=7
-HOMEPAGE=https://www.cabextract.org.uk/libmspack/
-IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=utils? ( !app-arch/mscompress )
-SLOT=0
-SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.8alpha.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=ed8c18aa07e667bd6d6114a85efcfbde
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
index 1b1f48bec7ff..e9ac54d21fb6 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Small library to access XDG Base Directories Specification paths
 EAPI=5
-HOMEPAGE=http://repo.or.cz/w/libxdg-basedir.git
+HOMEPAGE=https://github.com/devnev/libxdg-basedir
 IUSE=doc static-libs
 KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=913b65b245ec527249602fbd33819ea2
+_md5_=6411b289b24725353112667fce2f027b
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.2-r1 b/metadata/md5-cache/dev-libs/libzip-1.5.2-r1
index 782d76e03468..2cdcd44d5611 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.5.2-r1
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.2-r1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( >=net-libs/gnut
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.5.2.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a934864965ba21b75801ec4595fed371
+_md5_=8d6d0cc1ed5765cb1e39e49fed255f54
diff --git a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2 b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
index 17ce642f54df..79bff9d1560d 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries and applications to access smartcards
 EAPI=7
 HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
 IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
-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
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= )
 REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.19.0/opensc-0.19.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=bd206049e64daf5df90e625196c521b0
+_md5_=7527c3e59abb57bed0ea79ba77cf0b93
diff --git a/metadata/md5-cache/dev-libs/polylib-9999 b/metadata/md5-cache/dev-libs/polylib-9999
index 63c8fbd0724a..4d22c94a129b 100644
--- a/metadata/md5-cache/dev-libs/polylib-9999
+++ b/metadata/md5-cache/dev-libs/polylib-9999
@@ -6,4 +6,4 @@ HOMEPAGE=http://icps.u-strasbg.fr/polylib/
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=30804f3e510e69f38da6c29a9908d3ae
+_md5_=1faa4c1a7102b342af3745d8f13e764a
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.40.14 b/metadata/md5-cache/dev-libs/vala-common-0.40.14
index f46245445f14..c4af92888be4 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.40.14
+++ b/metadata/md5-cache/dev-libs/vala-common-0.40.14
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-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
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=29373af67b098eb27b0bd9cb5d541da1
+_md5_=f34f9e06180512f6f8c4d593ed21c656
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.27-r1 b/metadata/md5-cache/dev-libs/xmlsec-1.2.27-r1
index ee03bb7f6364..1d946998071e 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.27-r1
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.27-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig test? ( nss? ( >=dev-libs/nss-3.9[utils] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=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 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DEPEND=>=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:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting XML
 EAPI=7
 HOMEPAGE=https://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls libressl nss +openssl static-libs test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
-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 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.27.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=5fd492459b3ea6469464762406bb42ec
+_md5_=e0bb455fee26dee35d91b82821f66da6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 67790dae2a3c..dad2c4a56f0a 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0 b/metadata/md5-cache/dev-python/PyECLib-1.6.0
new file mode 100644
index 000000000000..ea0f8c3bc260
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
+EAPI=6
+HOMEPAGE=https://pypi.org/project/PyECLib/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.6.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b38716c57beaf55eea79727a6f87231d
diff --git a/metadata/md5-cache/dev-python/bpython-0.16 b/metadata/md5-cache/dev-python/bpython-0.16
deleted file mode 100644
index 22be2c67b2a3..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/curtsies-0.2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/watchdog[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=5
-HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/curtsies-0.2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/watchdog[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bpython/bpython-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dae0c11d00889542266181731805cb2c
diff --git a/metadata/md5-cache/dev-python/bpython-0.16-r1 b/metadata/md5-cache/dev-python/bpython-0.16-r1
deleted file mode 100644
index b0419cf5cbc3..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/watchdog[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=5
-HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/watchdog[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bpython/bpython-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3b744467c5b9a16c2940923b572e1735
diff --git a/metadata/md5-cache/dev-python/bpython-0.17 b/metadata/md5-cache/dev-python/bpython-0.18
similarity index 98%
rename from metadata/md5-cache/dev-python/bpython-0.17
rename to metadata/md5-cache/dev-python/bpython-0.18
index 0cce51adb8f8..054fbf2a22f7 100644
--- a/metadata/md5-cache/dev-python/bpython-0.17
+++ b/metadata/md5-cache/dev-python/bpython-0.18
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/watchdog[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/b/bpython/bpython-0.17.tar.gz
+SRC_URI=mirror://pypi/b/bpython/bpython-0.18.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8f321d5a5a6962a64b56a7aa96ab46a9
+_md5_=85c4bac47a3043289487e6d595094ccc
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
new file mode 100644
index 000000000000..95310f70f1de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-redis-4.10.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Full featured redis cache backend for Django.
+EAPI=7
+HOMEPAGE=https://github.com/niwinz/django-redis
+IUSE=python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=2e2c35e1562750f48c0c35b29dbbf6b4
diff --git a/metadata/md5-cache/dev-python/future-0.17.0 b/metadata/md5-cache/dev-python/future-0.17.0
index 7eb732f8d35d..5092f8797521 100644
--- a/metadata/md5-cache/dev-python/future-0.17.0
+++ b/metadata/md5-cache/dev-python/future-0.17.0
@@ -4,11 +4,11 @@ DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=7
 HOMEPAGE=http://python-future.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.17.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=ca565788b48cf85ab8f774f918d416dc
+_md5_=995310bac794fd2078d49628baec13c2
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403
new file mode 100644
index 000000000000..22695600e4bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/miniupnpc-2.1.20190403:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for UPnP client library
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/miniupnpc-2.1.20190403:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190403.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3f23dd01f09d2088a26e321c9a50597a
diff --git a/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1 b/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1
deleted file mode 100644
index 918f102236b3..000000000000
--- a/metadata/md5-cache/dev-python/pymediainfo-2.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/alabaster[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libmediainfo dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=A wrapper around the mediainfo library
-EAPI=7
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-2.3.0.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f06bb94b5d3739a9718f70d08d5910c5
diff --git a/metadata/md5-cache/dev-python/pymediainfo-3.0 b/metadata/md5-cache/dev-python/pymediainfo-4.0
similarity index 98%
rename from metadata/md5-cache/dev-python/pymediainfo-3.0
rename to metadata/md5-cache/dev-python/pymediainfo-4.0
index 42fdf164b193..5001ab4beedb 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-3.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.0
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-3.0.tar.gz
+SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4e9940ecbbf22171f3d69138d5ce30bf
+_md5_=a33dbb79f9f1e83e416c353928327377
diff --git a/metadata/md5-cache/dev-python/redis-py-3.2.1 b/metadata/md5-cache/dev-python/redis-py-3.2.1
new file mode 100644
index 000000000000..9894d3a56532
--- /dev/null
+++ b/metadata/md5-cache/dev-python/redis-py-3.2.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-db/redis dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Python client for Redis key-value store
+EAPI=7
+HOMEPAGE=https://github.com/andymccurdy/redis-py
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/r/redis/redis-3.2.1.tar.gz -> redis-py-3.2.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=e97b3718cfdb86143620909500064134
diff --git a/metadata/md5-cache/dev-python/setuptools-40.9.0 b/metadata/md5-cache/dev-python/setuptools-40.9.0
new file mode 100644
index 000000000000..cd489283714a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-40.9.0
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+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
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-40.9.0.zip
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=782b9e01487391a7654c063665f40466
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
index 39d0e32a9d0e..5f2d1de3b424 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
 EAPI=7
 HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=1e2667f40160ce10d0abbf15b3c43d9a
+_md5_=03347f833377e1db6fcfb0d78e6697fe
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 7269b8117772..bd64441ec768 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0 b/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0
new file mode 100644
index 000000000000..49546f01a220
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==dev-util/ragel-6* ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
+EAPI=6
+HOMEPAGE=https://github.com/ammar/regexp_parser
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.4.0.tar.gz -> regexp_parser-1.4.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=20932426f4d7c2569edd67ae20659e64
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index c995234ff129..5bca3219bee3 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/racket-7.0 b/metadata/md5-cache/dev-scheme/racket-7.0
index 0a9b5362c693..14777bad7063 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.0
+++ b/metadata/md5-cache/dev-scheme/racket-7.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
 DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
 EAPI=7
-HOMEPAGE=http://racket-lang.org/
+HOMEPAGE=https://racket-lang.org/
 IUSE=doc +futures +jit minimal +places +readline +threads +X
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3+ LGPL-3
 RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
 REQUIRED_USE=futures? ( jit )
 SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/7.0/racket-minimal-7.0-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/7.0/racket-7.0-src-builtpkgs.tgz )
+SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.0/racket-minimal-7.0-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.0/racket-7.0-src-builtpkgs.tgz )
 _eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
-_md5_=6320ad5ae0e5ac4bc83a29d0269f3899
+_md5_=c78d90d2b967f9cd34c6918c712d4635
diff --git a/metadata/md5-cache/dev-scheme/racket-7.1 b/metadata/md5-cache/dev-scheme/racket-7.1
index f1e8d345eea7..c8e54cfff38d 100644
--- a/metadata/md5-cache/dev-scheme/racket-7.1
+++ b/metadata/md5-cache/dev-scheme/racket-7.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
 DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
 EAPI=7
-HOMEPAGE=http://racket-lang.org/
+HOMEPAGE=https://racket-lang.org/
 IUSE=doc +futures +jit minimal +places +readline +threads +X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+ LGPL-3
 RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
 REQUIRED_USE=futures? ( jit )
 SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/7.1/racket-minimal-7.1-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/7.1/racket-7.1-src-builtpkgs.tgz )
+SRC_URI=minimal? ( https://download.racket-lang.org/installers/7.1/racket-minimal-7.1-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/7.1/racket-7.1-src-builtpkgs.tgz )
 _eclasses_=pax-utils	e85f015e815dd463b0c206d781ef45a5
-_md5_=bfd226da1501b363a7c44421b8b4b2a5
+_md5_=e525a920f3dc4f7c02e37d32e6f1d80a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2896b97858d1..fc3442036fd6 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/ninja-1.9.0 b/metadata/md5-cache/dev-util/ninja-1.9.0
new file mode 100644
index 000000000000..49fa8edb6ec0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.9.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEFINED_PHASES=compile install postinst postrm setup test
+DESCRIPTION=A small build system similar to make
+EAPI=7
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=a45e027bb8cf8033b5c0b608a6f61a6e
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 36701fccf4b8..82cdada9bdd0 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,11 +1,11 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
 LICENSE=Apache-2.0
-RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=2029297f4a2d59c2f2e392d7265f7d9c
+_md5_=a3d0981cb4a8b24646fbd52f0bcb6940
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2019.1 b/metadata/md5-cache/dev-util/pycharm-community-2019.1
index 32f6b13320b4..66e80b41b1ab 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2019.1
+++ b/metadata/md5-cache/dev-util/pycharm-community-2019.1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2019.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=957aff7fa620c0baaffd152bfb9ae109
+_md5_=3bc6af74ae159dbca6f38d40725fd510
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2019.1.1 b/metadata/md5-cache/dev-util/pycharm-community-2019.1.1
new file mode 100644
index 000000000000..345a2b2eb55c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2019.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2019.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3bc6af74ae159dbca6f38d40725fd510
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2019.1 b/metadata/md5-cache/dev-util/pycharm-professional-2019.1
index dbd96c220660..ac8d2a6fb4f4 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2019.1
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2019.1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
 KEYWORDS=~amd64 ~x86
 LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2019.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e39fff5ac924ee8bc1c5e9d57e5efb4b
+_md5_=782a89086436a6b488be9cca7d46f263
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1 b/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1
new file mode 100644
index 000000000000..62372b3b5638
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2019.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2019.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=782a89086436a6b488be9cca7d46f263
diff --git a/metadata/md5-cache/dev-util/radare2-3.1.3 b/metadata/md5-cache/dev-util/radare2-3.1.3
deleted file mode 100644
index 1e0af90f3e8e..000000000000
--- a/metadata/md5-cache/dev-util/radare2-3.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=7
-HOMEPAGE=http://www.radare.org
-IUSE=ssl libressl
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://github.com/radare/radare2/archive/3.1.3.tar.gz -> radare2-3.1.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=0b9fbd1ccdae37bb924c92028dd7a373
diff --git a/metadata/md5-cache/dev-util/radare2-3.2.1 b/metadata/md5-cache/dev-util/radare2-3.2.1
deleted file mode 100644
index 5539062ed8ef..000000000000
--- a/metadata/md5-cache/dev-util/radare2-3.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=7
-HOMEPAGE=http://www.radare.org
-IUSE=ssl libressl
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=https://github.com/radare/radare2/archive/3.2.1.tar.gz -> radare2-3.2.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=03da0005c00178b3a42dc03ca101b4fc
diff --git a/metadata/md5-cache/dev-util/radare2-3.2.0 b/metadata/md5-cache/dev-util/radare2-3.4.1
similarity index 88%
rename from metadata/md5-cache/dev-util/radare2-3.2.0
rename to metadata/md5-cache/dev-util/radare2-3.4.1
index aae8873fcb94..cabaf22e4cbe 100644
--- a/metadata/md5-cache/dev-util/radare2-3.2.0
+++ b/metadata/md5-cache/dev-util/radare2-3.4.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
-SRC_URI=https://github.com/radare/radare2/archive/3.2.0.tar.gz -> radare2-3.2.0.tar.gz
+SRC_URI=https://github.com/radare/radare2/archive/3.4.1.tar.gz -> radare2-3.4.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
 _md5_=03da0005c00178b3a42dc03ca101b4fc
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e51637166654..241948a16581 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/guilt-0.36-r1 b/metadata/md5-cache/dev-vcs/guilt-0.36-r1
index 5247e90ef801..7e9c04eac833 100644
--- a/metadata/md5-cache/dev-vcs/guilt-0.36-r1
+++ b/metadata/md5-cache/dev-vcs/guilt-0.36-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=dev-vcs/git app-text/asciidoc app-text/xmlto dev-lang/perl
 DESCRIPTION=A series of bash scripts which add a quilt-like interface to git
 EAPI=7
-HOMEPAGE=http://repo.or.cz/w/guilt.git
+HOMEPAGE=https://repo.or.cz/w/guilt.git
 KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-vcs/git
 RESTRICT=test
 SLOT=0
-SRC_URI=http://repo.or.cz/w/guilt.git/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> guilt-0.36.tar.gz
-_md5_=5cb62c0f3f232ea98d4b22db776f7852
+SRC_URI=https://repo.or.cz/w/guilt.git/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz -> guilt-0.36.tar.gz
+_md5_=a201462874fb7e7c5d1f2f7cab54034c
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 6a7464691dfe..944f2ae2e899 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/mastergear-bin-4.3 b/metadata/md5-cache/games-emulation/mastergear-bin-4.5
similarity index 75%
rename from metadata/md5-cache/games-emulation/mastergear-bin-4.3
rename to metadata/md5-cache/games-emulation/mastergear-bin-4.5
index 526f9db3978e..5b8e8aed4a3b 100644
--- a/metadata/md5-cache/games-emulation/mastergear-bin-4.3
+++ b/metadata/md5-cache/games-emulation/mastergear-bin-4.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=SEGA Master System / Game Gear emulator
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fms.komkon.org/MG/
 KEYWORDS=~amd64
 LICENSE=all-rights-reserved
 RDEPEND=>=sys-libs/glibc-2.15 sys-libs/zlib x11-libs/libX11 x11-libs/libXext || ( media-sound/pulseaudio media-sound/apulse )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://fms.komkon.org/MG/MG43-Ubuntu-x86-bin.tgz
-_md5_=88978a9ec5cff940deb45df4687f192d
+SRC_URI=https://fms.komkon.org/MG/MG45-Ubuntu-x86-bin.tgz
+_md5_=6051675a314c7d7c81286250ba7a2967
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 663341c10b40..b9747d61199f 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/angband-4.1.3 b/metadata/md5-cache/games-roguelike/angband-4.1.3
index 1ead691579bc..19782f8268c6 100644
--- a/metadata/md5-cache/games-roguelike/angband-4.1.3
+++ b/metadata/md5-cache/games-roguelike/angband-4.1.3
@@ -12,4 +12,4 @@ REQUIRED_USE=sound? ( sdl ) || ( X ncurses )
 SLOT=0
 SRC_URI=https://rephial.org/downloads/4.1/angband-4.1.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=50b2369ed891c6870b23046bbaaedff0
+_md5_=904bd8e68668b254cf472eb5dee225a0
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 1ba47a25a9bc..dc7d2fafc687 100644
Binary files a/metadata/md5-cache/gnustep-apps/Manifest.gz and b/metadata/md5-cache/gnustep-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gnustep-apps/sogo-4.0.7 b/metadata/md5-cache/gnustep-apps/sogo-4.0.7
new file mode 100644
index 000000000000..3b098ffc1ec9
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/sogo-4.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.0.7[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=6
+HOMEPAGE=http://www.sogo.nu
+IUSE=activesync gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.0.7[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-4.0.7.tar.gz -> sogo-4.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=e488ab0d7918f8e3b1ce07783b3c6458
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index 8fcaebcb528b..cf68dc4e5d7e 100644
Binary files a/metadata/md5-cache/gnustep-libs/Manifest.gz and b/metadata/md5-cache/gnustep-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gnustep-libs/sope-4.0.7 b/metadata/md5-cache/gnustep-libs/sope-4.0.7
new file mode 100644
index 000000000000..e88b271d420c
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/sope-4.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-4.0.7.tar.gz -> sope-4.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=67fd148b38912f95a2ff32aff7497ba6
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 18acd5787882..9ce8275635a7 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/tepl-4.2.0 b/metadata/md5-cache/gui-libs/tepl-4.2.0
new file mode 100644
index 000000000000..9be104ca518a
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/tepl-4.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=sys-devel/gettext-0.19.4 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GtkSourceView-based text editors and IDE helper library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Gtef
+IUSE=+introspection test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-4.0:4[introspection?] >=gui-libs/amtk-5.0:5[introspection?] >=dev-libs/libxml2-2.5:2 app-i18n/uchardet introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/tepl/4.2/tepl-4.2.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b3e13f32f54bca9b65031042d639c43c
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 23137588a076..979787157d0a 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.9 b/metadata/md5-cache/mail-client/roundcube-1.3.9
new file mode 100644
index 000000000000..ea6bd8c0c70f
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=6
+HOMEPAGE=https://roundcube.net
+IUSE=change-password enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 virtual/httpd-php change-password? ( >=dev-php/PEAR-Net_Socket-1.2.1 dev-lang/php[sockets] ) enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.3.9
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.9/roundcubemail-1.3.9-complete.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=80a4ec44f607ca57a41e35ea1f99096c
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.5.3 b/metadata/md5-cache/mail-client/thunderbird-60.5.3
deleted file mode 100644
index 43a7bc300940..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-60.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/thunderbird
-IUSE=bindist clang dbus debug hardened jack lightning neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla sec-policy/selinux-thunderbird )
-REQUIRED_USE=wifi? ( dbus )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ar.xpi -> thunderbird-60.5.3-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ast.xpi -> thunderbird-60.5.3-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/be.xpi -> thunderbird-60.5.3-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/bg.xpi -> thunderbird-60.5.3-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/br.xpi -> thunderbird-60.5.3-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ca.xpi -> thunderbird-60.5.3-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/cs.xpi -> thunderbird-60.5.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/cy.xpi -> thunderbird-60.5.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/da.xpi -> thunderbird-60.5.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/de.xpi -> thunderbird-60.5.3-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/el.xpi -> thunderbird-60.5.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/en-GB.xpi -> thunderbird-60.5.3-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/es-AR.xpi -> thunderbird-60.5.3-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/es-ES.xpi -> thunderbird-60.5.3-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/et.xpi -> thunderbird-60.5.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/eu.xpi -> thunderbird-60.5.3-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fi.xpi -> thunderbird-60.5.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fr.xpi -> thunderbird-60.5.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.5.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.5.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/gd.xpi -> thunderbird-60.5.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/gl.xpi -> thunderbird-60.5.3-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/he.xpi -> thunderbird-60.5.3-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hr.xpi -> thunderbird-60.5.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hsb.xpi -> thunderbird-60.5.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hu.xpi -> thunderbird-60.5.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.5.3-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/id.xpi -> thunderbird-60.5.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/is.xpi -> thunderbird-60.5.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/it.xpi -> thunderbird-60.5.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ja.xpi -> thunderbird-60.5.3-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ko.xpi -> thunderbird-60.5.3-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/lt.xpi -> thunderbird-60.5.3-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.5.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nl.xpi -> thunderbird-60.5.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.5.3-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pl.xpi -> thunderbird-60.5.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.5.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.5.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/rm.xpi -> thunderbird-60.5.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ro.xpi -> thunderbird-60.5.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ru.xpi -> thunderbird-60.5.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/si.xpi -> thunderbird-60.5.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sk.xpi -> thunderbird-60.5.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sl.xpi -> thunderbird-60.5.3-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sq.xpi -> thunderbird-60.5.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sr.xpi -> thunderbird-60.5.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.5.3-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/tr.xpi -> thunderbird-60.5.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/uk.xpi -> thunderbird-60.5.3-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/vi.xpi -> thunderbird-60.5.3-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.5.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.5.3-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/source/thunderbird-60.5.3.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.5-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=da16c57678fb4be8d582d627d79df546
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.6.0 b/metadata/md5-cache/mail-client/thunderbird-60.6.0
deleted file mode 100644
index 9be0641356ad..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-60.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/thunderbird
-IUSE=bindist clang dbus debug hardened jack lightning neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla sec-policy/selinux-thunderbird )
-REQUIRED_USE=wifi? ( dbus )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ar.xpi -> thunderbird-60.6.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ast.xpi -> thunderbird-60.6.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/be.xpi -> thunderbird-60.6.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/bg.xpi -> thunderbird-60.6.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/br.xpi -> thunderbird-60.6.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ca.xpi -> thunderbird-60.6.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/cs.xpi -> thunderbird-60.6.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/cy.xpi -> thunderbird-60.6.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/da.xpi -> thunderbird-60.6.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/de.xpi -> thunderbird-60.6.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/el.xpi -> thunderbird-60.6.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.6.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.6.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.6.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/et.xpi -> thunderbird-60.6.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/eu.xpi -> thunderbird-60.6.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/fi.xpi -> thunderbird-60.6.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/fr.xpi -> thunderbird-60.6.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.6.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.6.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/gd.xpi -> thunderbird-60.6.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/gl.xpi -> thunderbird-60.6.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/he.xpi -> thunderbird-60.6.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/hr.xpi -> thunderbird-60.6.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.6.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/hu.xpi -> thunderbird-60.6.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.6.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/id.xpi -> thunderbird-60.6.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/is.xpi -> thunderbird-60.6.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/it.xpi -> thunderbird-60.6.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ja.xpi -> thunderbird-60.6.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ko.xpi -> thunderbird-60.6.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/lt.xpi -> thunderbird-60.6.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.6.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/nl.xpi -> thunderbird-60.6.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.6.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/pl.xpi -> thunderbird-60.6.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.6.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.6.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/rm.xpi -> thunderbird-60.6.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ro.xpi -> thunderbird-60.6.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/ru.xpi -> thunderbird-60.6.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/si.xpi -> thunderbird-60.6.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/sk.xpi -> thunderbird-60.6.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/sl.xpi -> thunderbird-60.6.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/sq.xpi -> thunderbird-60.6.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/sr.xpi -> thunderbird-60.6.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.6.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/tr.xpi -> thunderbird-60.6.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/uk.xpi -> thunderbird-60.6.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/vi.xpi -> thunderbird-60.6.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.6.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.6.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.6.0/source/thunderbird-60.6.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=364c5c8845a9c75b83e32988df646ba4
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-60.5.3 b/metadata/md5-cache/mail-client/thunderbird-bin-60.5.3
deleted file mode 100644
index 264c8a86332b..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-60.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip app-arch/zip app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ar.xpi -> thunderbird-60.5.3-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ast.xpi -> thunderbird-60.5.3-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/be.xpi -> thunderbird-60.5.3-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/bg.xpi -> thunderbird-60.5.3-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/br.xpi -> thunderbird-60.5.3-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ca.xpi -> thunderbird-60.5.3-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/cs.xpi -> thunderbird-60.5.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/cy.xpi -> thunderbird-60.5.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/da.xpi -> thunderbird-60.5.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/de.xpi -> thunderbird-60.5.3-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/el.xpi -> thunderbird-60.5.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/en-GB.xpi -> thunderbird-60.5.3-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/es-AR.xpi -> thunderbird-60.5.3-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/es-ES.xpi -> thunderbird-60.5.3-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/et.xpi -> thunderbird-60.5.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/eu.xpi -> thunderbird-60.5.3-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fi.xpi -> thunderbird-60.5.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fr.xpi -> thunderbird-60.5.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.5.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.5.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/gd.xpi -> thunderbird-60.5.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/gl.xpi -> thunderbird-60.5.3-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/he.xpi -> thunderbird-60.5.3-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hr.xpi -> thunderbird-60.5.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hsb.xpi -> thunderbird-60.5.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hu.xpi -> thunderbird-60.5.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.5.3-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/id.xpi -> thunderbird-60.5.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/is.xpi -> thunderbird-60.5.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/it.xpi -> thunderbird-60.5.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ja.xpi -> thunderbird-60.5.3-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ko.xpi -> thunderbird-60.5.3-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/lt.xpi -> thunderbird-60.5.3-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.5.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nl.xpi -> thunderbird-60.5.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.5.3-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pl.xpi -> thunderbird-60.5.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.5.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.5.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/rm.xpi -> thunderbird-60.5.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ro.xpi -> thunderbird-60.5.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/ru.xpi -> thunderbird-60.5.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/si.xpi -> thunderbird-60.5.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sk.xpi -> thunderbird-60.5.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sl.xpi -> thunderbird-60.5.3-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sq.xpi -> thunderbird-60.5.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sr.xpi -> thunderbird-60.5.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.5.3-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/tr.xpi -> thunderbird-60.5.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/uk.xpi -> thunderbird-60.5.3-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/vi.xpi -> thunderbird-60.5.3-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.5.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.5.3-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-x86_64/en-US/thunderbird-60.5.3.tar.bz2 -> thunderbird-bin_x86_64-60.5.3.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.3/linux-i686/en-US/thunderbird-60.5.3.tar.bz2 -> thunderbird-bin_i686-60.5.3.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9ac1206f555d9479e2a180734fc1e2c4
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 3df31b346f7f..e70865ccfa79 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.48 b/metadata/md5-cache/media-gfx/asymptote-2.48
deleted file mode 100644
index eb0dd965e042..000000000000
--- a/metadata/md5-cache/media-gfx/asymptote-2.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A vector graphics language that provides a framework for technical drawing
-EAPI=6
-HOMEPAGE=http://asymptote.sourceforge.net/
-IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) offscreen? ( opengl ) doc? ( boehm-gc )
-SLOT=0
-SRC_URI=mirror://sourceforge/asymptote/asymptote-2.48.src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=a71e0f1d4f58ecfe0e752fe9e096c6ce
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.48-r1 b/metadata/md5-cache/media-gfx/asymptote-2.48-r1
new file mode 100644
index 000000000000..49cbb11bf040
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/asymptote-2.48-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=A vector graphics language that provides a framework for technical drawing
+EAPI=6
+HOMEPAGE=http://asymptote.sourceforge.net/
+IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) offscreen? ( opengl ) doc? ( boehm-gc )
+SLOT=0
+SRC_URI=mirror://sourceforge/asymptote/asymptote-2.48.src.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=8a959e82e3496a5aa1a4b6560f05b738
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.2.0 b/metadata/md5-cache/media-gfx/displaycal-3.7.2.0
new file mode 100644
index 000000000000..eac9e9ca0349
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.7.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Display calibration and characterization powered by Argyll CMS
+EAPI=6
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=db12da52ed673c6a1b29ae2b1b7dfcb7
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.7.2.0-r1 b/metadata/md5-cache/media-gfx/displaycal-3.7.2.0-r1
new file mode 100644
index 000000000000..31f5a50080e4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.7.2.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Display calibration and characterization powered by Argyll CMS
+EAPI=6
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 dev-python/faulthandler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.7.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0021967a7c3455e3794fbea87254c0f2
diff --git a/metadata/md5-cache/media-gfx/iscan-2.30.3.1 b/metadata/md5-cache/media-gfx/iscan-2.30.3.1
index 781914de764a..a3097c972fc3 100644
--- a/metadata/md5-cache/media-gfx/iscan-2.30.3.1
+++ b/metadata/md5-cache/media-gfx/iscan-2.30.3.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.3-1.tar.gz doc? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_e.pdf l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_j.pdf ) )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=defc9de2fdef1b52110ed6d142d68381
+_md5_=89b9e5c09a7677a55ef07dbe266f6516
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.8 b/metadata/md5-cache/media-gfx/krita-4.1.8-r1
similarity index 99%
rename from metadata/md5-cache/media-gfx/krita-4.1.8
rename to metadata/md5-cache/media-gfx/krita-4.1.8-r1
index 673cb39d9052..67212d39cfcd 100644
--- a/metadata/md5-cache/media-gfx/krita-4.1.8
+++ b/metadata/md5-cache/media-gfx/krita-4.1.8-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.1.8/krita-4.1.8.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	79b9341795c77777bb58dd1513bcbbb6	kde5-functions	4babdfdd1fc3c9b61b29144846fa5d3b	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=243c9d3b71b0c8e1642b1db42c3ba890
+_md5_=a9c5faa3fc1c83a1295d9d4bbd752833
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ebae023deea6..c5a6576b2cf2 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libXcm-9999 b/metadata/md5-cache/media-libs/libXcm-9999
index ee40c58b15a9..38d03e776c66 100644
--- a/metadata/md5-cache/media-libs/libXcm-9999
+++ b/metadata/md5-cache/media-libs/libXcm-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXmu ) x11-base/xorg-proto
 DESCRIPTION=Reference implementation of the X Color Management specification
-EAPI=6
-HOMEPAGE=http://www.oyranos.org/libxcm/
-IUSE=static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+EAPI=7
+HOMEPAGE=https://www.oyranos.org/libxcm/
+IUSE=static-libs X
 LICENSE=MIT
-RDEPEND=X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXmu )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4ea083ec15abf714b419f24512ab13c7
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=c488169be38a0c9ff6f1cb0e270ef247
diff --git a/metadata/md5-cache/media-libs/ming-0.20181112 b/metadata/md5-cache/media-libs/ming-0.20181112
new file mode 100644
index 000000000000..7059410c28cc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ming-0.20181112
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) media-libs/freetype:= media-libs/libpng:0= media-libs/giflib:= sys-libs/zlib:= !media-libs/libswf sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=An Open Source library for Flash movie generation
+EAPI=6
+HOMEPAGE=http://ming.sourceforge.net/
+IUSE=+perl php +python static-libs python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+PDEPEND=php? ( dev-php/ming-php )
+RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) media-libs/freetype:= media-libs/libpng:0= media-libs/giflib:= sys-libs/zlib:= !media-libs/libswf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/libming/libming/archive/50098023446a5412efcfbd40552821a8cba983a6.tar.gz -> ming-0.20181112.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2c4ed8de48789a488e8241a044004bf3
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 22d571dfe6cd..8295c631d749 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.1_p20190113 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.1_p20190113
deleted file mode 100644
index 56acec9e5cc8..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.1_p20190113
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=FFmpeg based gstreamer plugin
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
-IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gst-libav-1.14.4-ffmpeg4-patchset.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-4.1.1.tar.bz2 )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4e1dd23d702488d7c9f4b7226817235c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.2_p20190329 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
similarity index 99%
rename from metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.2_p20190329
rename to metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
index 1e02c17230a6..700fea43db74 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.2_p20190329
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
@@ -9,6 +9,6 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gst-libav-1.14.4-ffmpeg4-patchset.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-4.1.2.tar.bz2 )
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gst-libav-1.14.4-ffmpeg4-patchset.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
 _md5_=bc35af76d60a20746cdd6bacc303f8b0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
new file mode 100644
index 000000000000..233bfc1ea29a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's VuPlus client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.22.0-Leia.tar.gz -> kodi-pvr-vuplus-3.22.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8998495db7ea..9cfbc9f50b99 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mp3splt-2.6.2 b/metadata/md5-cache/media-sound/mp3splt-2.6.2
index ad8f93893adb..dc8f417e59f2 100644
--- a/metadata/md5-cache/media-sound/mp3splt-2.6.2
+++ b/metadata/md5-cache/media-sound/mp3splt-2.6.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=~media-libs/libmp3splt-0.9.2[flac?] virtual/pkgconfig sys-devel/gettext
+DEPEND=>=media-libs/libmp3splt-0.9.2-r1[flac?] virtual/pkgconfig sys-devel/gettext
 DESCRIPTION=a command line utility to split mp3 and ogg files without decoding
-EAPI=5
+EAPI=7
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=flac
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=~media-libs/libmp3splt-0.9.2[flac?]
+RDEPEND=>=media-libs/libmp3splt-0.9.2-r1[flac?]
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-2.6.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=3eda8ebcf0100a24b546a1ecff12dd74
+_md5_=66a3b25bc9eb773524eb8eed3c67b63a
diff --git a/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1 b/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
index fbbd1eb85951..e208c1c3cc61 100644
--- a/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
+++ b/metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=~media-libs/libmp3splt-0.9.2 x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0[mp3] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/libmp3splt-0.9.2 x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0[mp3] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a GTK+ based utility to split mp3 and ogg files without decoding
 EAPI=6
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=audacious doc gstreamer nls
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=~media-libs/libmp3splt-0.9.2 x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0[mp3] )
+RDEPEND=>=media-libs/libmp3splt-0.9.2 x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) !audacious? ( dev-libs/dbus-glib ) gstreamer? ( media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0[mp3] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-gtk-0.9.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4cef774c2925038a07194efe56bd0cc7
+_md5_=fbba33aa9754ed442d790dfbc08baf99
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.21-r1 b/metadata/md5-cache/media-sound/mpd-0.20.21-r1
deleted file mode 100644
index 927155f24a0d..000000000000
--- a/metadata/md5-cache/media-sound/mpd-0.20.21-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) dev-libs/boost virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The Music Player Daemon (mpd)
-EAPI=6
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
-IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav kernel_linux
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos
-LICENSE=GPL-2
-RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) !<sys-cluster/mpich2-1.4_rc2 selinux? ( sec-policy/selinux-mpd )
-REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) opus? ( ogg ) upnp? ( expat ) webdav? ( curl expat )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpd/0.20/mpd-0.20.21.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a99ebc931618265b6d353e8d9d48d8db
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.7 b/metadata/md5-cache/media-sound/mpd-0.21.7
new file mode 100644
index 000000000000..d6ae109b45d8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.7.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=05a6aeb83486a590d834d8bb3d6d0a25
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-9999 b/metadata/md5-cache/media-sound/ncmpcpp-9999
index 42498c4c584c..d15991c443f0 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-9999
+++ b/metadata/md5-cache/media-sound/ncmpcpp-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu?,nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* icu? ( dev-libs/icu:= ) taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
 DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=7
-HOMEPAGE=http://ncmpcpp.rybczak.net/
+HOMEPAGE=https://ncmpcpp.rybczak.net/
 IUSE=clock icu outputs taglib visualizer
 LICENSE=GPL-2
 RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[icu?,nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* icu? ( dev-libs/icu:= ) taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=db250fcfa55421da9a713fe893d63a47
+_md5_=4a2742eb7a5e348e1af753c6cbab4b17
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index dd80de274c64..9e7e74446877 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index 54ff0437880b..9d63a0bc364d 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure postinst postrm preinst prepare test unpack
-DEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet ) dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( ~dev-cpp/gtest-1.7.0 dev-lua/busted dev-lua/luarocks ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Advanced subtitle editor
 EAPI=6
 HOMEPAGE=http://www.aegisub.org/ https://github.com/Aegisub/Aegisub
-IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet
+IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell +uchardet
 LICENSE=BSD MIT
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
+RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8adba77664c64a1e143a8b129653d61c
+_md5_=6a18a0a26d42bb38aa3185fcb1ce21b0
diff --git a/metadata/md5-cache/media-video/parole-1.0.2 b/metadata/md5-cache/media-video/parole-1.0.2
new file mode 100644
index 000000000000..4dacf75fe461
--- /dev/null
+++ b/metadata/md5-cache/media-video/parole-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=A simple Xfce4 media player using GStreamer
+EAPI=6
+HOMEPAGE=https://docs.xfce.org/apps/parole/start
+IUSE=libnotify taglib
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/parole/1.0/parole-1.0.2.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=47e6e2f9b3b3826be739a467e11f62ce
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index e88580d0f6f7..1e74fd060f3a 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-9.12.3_p4
index d90bbb474d5e..023a71cf973f 100644
--- a/metadata/md5-cache/net-dns/bind-9.12.3_p4
+++ b/metadata/md5-cache/net-dns/bind-9.12.3_p4
@@ -5,7 +5,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.3-P4/?version=tar-gz -> bind-9.12.3_p4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=5f079184feaa191e733bfe6831ebad43
+_md5_=7050fc5d59dd4a260fb7e54a778524c1
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
index 8387744f03e1..93b988bc14bb 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
@@ -5,7 +5,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.3-P4/?version=tar-gz -> bind-9.12.3_p4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=0845b1f47e2f0ea033f42c17b792954e
+_md5_=79b37e66147d288beca7ae678c7a89bf
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2 b/metadata/md5-cache/net-dns/dnsviz-0.8.2
new file mode 100644
index 000000000000..1edf5af3304d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/m2crypto-0.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
+EAPI=7
+HOMEPAGE=http://dnsviz.net/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/m2crypto-0.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=8e37dce78001a214e530c497bf8ff7ff
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 6c8b2909dfce..6116cccb2a9c 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/mc-2019.03.28.20.43.56 b/metadata/md5-cache/net-fs/mc-2019.03.28.20.43.56
index bf7c64259ab2..3b33f329c87c 100644
--- a/metadata/md5-cache/net-fs/mc-2019.03.28.20.43.56
+++ b/metadata/md5-cache/net-fs/mc-2019.03.28.20.43.56
@@ -1,13 +1,13 @@
+BDEPEND=>=dev-lang/go-1.10
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
 DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/minio/mc
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-03-28T20-43-56Z.tar.gz -> mc-2019.03.28.20.43.56.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=34fb679d4567d11fa7aaa421e2dd8d73
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-03-28T20-43-56Z.tar.gz -> mc-2019.03.28.20.43.56.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/h2non/filetype/archive/cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz -> github.com-h2non-filetype-cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/pkg/xattr/archive/dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz -> github.com-pkg-xattr-dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz https://github.com/golang/text/archive/6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz -> github.com-golang-text-6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/hashicorp/go-version/archive/d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz -> github.com-hashicorp-go-version-d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/golang/net/archive/b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz -> github.com-golang-net-b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz https://github.com/golang/crypto/archive/a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz -> github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/posener/complete/archive/3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz -> github.com-posener-complete-3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/hashicorp/go-multierror/archive/886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz -> github.com-hashicorp-go-multierror-886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz https://github.com/hashicorp/errwrap/archive/8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz -> github.com-hashicorp-errwrap-8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/minio-go/archive/5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz -> github.com-minio-minio-go-5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz https://github.com/minio/minio/archive/0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz -> github.com-minio-minio-0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=e4ec2385cfd6668d57da4196cd4c2ce9
diff --git a/metadata/md5-cache/net-fs/mc-2019.04.03.17.59.57 b/metadata/md5-cache/net-fs/mc-2019.04.03.17.59.57
new file mode 100644
index 000000000000..8dedaabd2a22
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2019.04.03.17.59.57
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
+EAPI=7
+HOMEPAGE=https://github.com/minio/mc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!app-misc/mc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-04-03T17-59-57Z.tar.gz -> mc-2019.04.03.17.59.57.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/h2non/filetype/archive/cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz -> github.com-h2non-filetype-cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/pkg/xattr/archive/dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz -> github.com-pkg-xattr-dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz https://github.com/golang/text/archive/6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz -> github.com-golang-text-6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/hashicorp/go-version/archive/d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz -> github.com-hashicorp-go-version-d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/golang/net/archive/b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz -> github.com-golang-net-b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz https://github.com/golang/crypto/archive/a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz -> github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/posener/complete/archive/3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz -> github.com-posener-complete-3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/hashicorp/go-multierror/archive/886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz -> github.com-hashicorp-go-multierror-886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz https://github.com/hashicorp/errwrap/archive/8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz -> github.com-hashicorp-errwrap-8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/minio-go/archive/5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz -> github.com-minio-minio-go-5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz https://github.com/minio/minio/archive/0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz -> github.com-minio-minio-0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=e4ec2385cfd6668d57da4196cd4c2ce9
diff --git a/metadata/md5-cache/net-fs/minio-2019.04.04.18.31.46 b/metadata/md5-cache/net-fs/minio-2019.04.04.18.31.46
new file mode 100644
index 000000000000..a26e3b0778ff
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.04.04.18.31.46
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare setup test unpack
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=7
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2019-04-04T18-31-46Z.tar.gz -> minio-2019.04.04.18.31.46.tar.gz https://github.com/go-yaml/yaml/archive/51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz -> github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz https://github.com/olivere/elastic/archive/f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz -> github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz https://github.com/Shopify/sarama/archive/879f631812a30a580659e8035e7cda9994bb99ac.tar.gz -> github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/golang/net/archive/eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz -> github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz https://github.com/golang/text/archive/e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz -> github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz https://github.com/golang/crypto/archive/38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz -> github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz https://github.com/uber-go/atomic/archive/1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz -> github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz https://github.com/valyala/tcplisten/archive/ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz -> github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz https://github.com/googleapis/google-cloud-go/archive/a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz -> github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz https://github.com/tidwall/sjson/archive/25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz -> github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz https://github.com/tidwall/gjson/archive/eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz -> github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz https://github.com/tidwall/pretty/archive/1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz -> github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz https://github.com/tidwall/match/archive/33827db735fff6510490d69a8622612558a557ed.tar.gz -> github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz https://github.com/streadway/amqp/archive/14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz -> github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz https://github.com/skyrings/skyring-common/archive/d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz -> github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rs/cors/archive/9a47f48565a795472d43519dd49aac781f3034fb.tar.gz -> github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/rcrowley/go-metrics/archive/3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz -> github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/procfs/archive/55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz -> github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz https://github.com/prometheus/common/archive/5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz -> github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz https://github.com/prometheus/client_model/archive/fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz -> github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/pkg/errors/archive/ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz -> github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz https://github.com/pierrec/lz4/archive/315a67e90e415bcdaff33057da191569bf4d8479.tar.gz -> github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/nats-io/nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/nuid/archive/3024a71c3cbe30667286099921591e6fcc328230.tar.gz -> github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz https://github.com/nats-io/nkeys/archive/1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz -> github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz https://github.com/nats-io/go-nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/go-nats-streaming/archive/4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz -> github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz https://github.com/Azure/azure-sdk-for-go/archive/d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz -> github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz https://github.com/Azure/go-autorest/archive/3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz -> github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz https://github.com/DataDog/zstd/archive/c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz -> github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz https://github.com/mailru/easyjson/archive/1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz -> github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz https://github.com/gorilla/mux/archive/a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz -> github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz https://github.com/coredns/coredns/archive/8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz -> github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/eapache/go-resiliency/archive/842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz -> github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz https://github.com/minio/minio-go/archive/5325257a208fc630aaaac31bc00789acbc998c14.tar.gz -> github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz https://github.com/alecthomas/participle/archive/98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz -> github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz https://github.com/aliyun/aliyun-oss-go-sdk/archive/86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz -> github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz https://github.com/bcicen/jstream/archive/16c1f8af81c2a9967b30d365a29472126274f998.tar.gz -> github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/gogo/protobuf/archive/382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz -> github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz https://github.com/davecgh/go-spew/archive/d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz -> github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/klauspost/pgzip/archive/083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz -> github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz https://github.com/marstr/guid/archive/8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz -> github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz https://github.com/coreos/etcd/archive/d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz -> github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/gorilla/rpc/archive/bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz -> github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz https://github.com/djherbis/atime/archive/8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz -> github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/eapache/go-xerial-snappy/archive/776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz -> github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/golang/protobuf/archive/d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz -> github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz https://github.com/fatih/structs/archive/4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz -> github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz https://github.com/minio/parquet-go/archive/9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz -> github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz https://github.com/grpc/grpc-go/archive/3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz -> github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz https://github.com/google/go-genproto/archive/64821d5d210748c883cd2b809589555ae4654203.tar.gz -> github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz -> github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz https://github.com/apache/thrift/archive/c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz -> github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz -> github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz -> github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz https://github.com/klauspost/compress/archive/30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz -> github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz https://github.com/hashicorp/vault/archive/36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz -> github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/miekg/dns/archive/73601d4aed9d844322611759d7f3619110b7c88e.tar.gz -> github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz https://github.com/klauspost/reedsolomon/archive/a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz -> github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz https://github.com/gomodule/redigo/archive/9c11da706d9b7902c6da69c592f75637793fe121.tar.gz -> github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz https://github.com/go-sql-driver/mysql/archive/72cd26f257d44c1114970e19afddcd812016007e.tar.gz -> github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz https://github.com/gorilla/handlers/archive/7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz -> github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz https://github.com/mattn/go-isatty/archive/c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz -> github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/golang/snappy/archive/2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz -> github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz https://github.com/klauspost/cpuid/archive/e7e905edc00ea8827e58662220139109efea09db.tar.gz -> github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-ocagent/archive/902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz https://github.com/lib/pq/archive/4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz -> github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/census-instrumentation/opencensus-proto/archive/a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz -> github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/mc/archive/a1355e50e2e8984d645cc7745230c42b27396341.tar.gz -> github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/grpc-ecosystem/grpc-gateway/archive/20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz -> github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/minio/blazer/archive/2081f5bf046503f576d8712253724fbf2950fffe.tar.gz -> github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz https://github.com/minio/dsync/archive/fb604afd87b2a095432c17af2dda742960ef111e.tar.gz -> github.com-minio-dsync-fb604afd87b2a095432c17af2dda742960ef111e.tar.gz https://github.com/minio/highwayhash/archive/02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz -> github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz https://github.com/minio/lsync/archive/a4e43e3d0887e88d151bb3f90f678178b4ec0c5f.tar.gz -> github.com-minio-lsync-a4e43e3d0887e88d151bb3f90f678178b4ec0c5f.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/minio/sio/archive/035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz -> github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz https://github.com/golang/sync/archive/e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz -> github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/googleapis/google-cloud-go/archive/458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz -> github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz https://github.com/googleapis/gax-go/archive/beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz -> github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=a2d158bf15576b694fd9fe6600ea7fe3
diff --git a/metadata/md5-cache/net-fs/samba-4.10.1 b/metadata/md5-cache/net-fs/samba-4.10.1
new file mode 100644
index 000000000000..383bd468293d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.10.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.10.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=0f5d13941298a36ba1d83e45282c2d0e
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b3086f76471f..e47d4171002c 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403
new file mode 100644
index 000000000000..fa85e58d0270
--- /dev/null
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+DESCRIPTION=UPnP client library and a simple UPnP client
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=ipv6 kernel_linux static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+SLOT=0/17
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190403.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=a4616e6e9ae302aaa1107b81b83f5ae3
diff --git a/metadata/md5-cache/net-libs/nodejs-6.17.1 b/metadata/md5-cache/net-libs/nodejs-6.17.1
new file mode 100644
index 000000000000..df00aaab8bf9
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-6.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v6.17.1/node-v6.17.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7cbb1108977f7da4a0a8bcd2bd265427
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a99396dc38be..4fbee47796e6 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/gerbera-1.3.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.3.1
similarity index 94%
rename from metadata/md5-cache/net-misc/gerbera-1.3.0-r1
rename to metadata/md5-cache/net-misc/gerbera-1.3.1
index 971c08ae0976..99dbcd3166e1 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.3.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.3.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-SRC_URI=https://github.com/gerbera/gerbera/archive/v1.3.0.tar.gz -> gerbera-1.3.0.tar.gz
+SRC_URI=https://github.com/gerbera/gerbera/archive/v1.3.1.tar.gz -> gerbera-1.3.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	a6dd0427ea9c68067a0a7fe2236b457f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=02db15b7743cc78b0d7228050f3be545
+_md5_=a25c2220407f7c595d2b49a159e739ee
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403
new file mode 100644
index 000000000000..508a9eb27af1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0=
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190403.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=4e4c4b5fc43de15ed2240c8af922dd16
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.10.0 b/metadata/md5-cache/net-misc/modemmanager-1.10.0
new file mode 100644
index 000000000000..6427164307a8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/modemmanager-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.22.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
+IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.22.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
+REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
+SLOT=0/1
+SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.10.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=68a27f0b26287e0945ae6ca4b73becea
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.5.4.11654 b/metadata/md5-cache/net-misc/owncloud-client-2.5.4.11654
new file mode 100644
index 000000000000..eba2ef266aff
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.5.4.11654
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=6
+HOMEPAGE=https://owncloud.org/
+IUSE=doc dolphin nautilus shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 )
+SLOT=0
+SRC_URI=https://download.owncloud.com/desktop/stable/owncloudclient-2.5.4.11654.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5a3b3ff15b0cc2e400bf0d60a8d7520f
diff --git a/metadata/md5-cache/net-misc/shigofumi-0.3-r1 b/metadata/md5-cache/net-misc/shigofumi-0.3-r1
index cff6c4f37c0a..26982d0eb9f5 100644
--- a/metadata/md5-cache/net-misc/shigofumi-0.3-r1
+++ b/metadata/md5-cache/net-misc/shigofumi-0.3-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/l
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/shigofumi/dist/shigofumi-0.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=31d7897f4873a181ed408187bf061702
+_md5_=2ae53855088f6629680b3eb80359ad2c
diff --git a/metadata/md5-cache/net-misc/shigofumi-9999 b/metadata/md5-cache/net-misc/shigofumi-9999
index 985272eb72de..6a4b1500dc75 100644
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=31d7897f4873a181ed408187bf061702
+_md5_=2ae53855088f6629680b3eb80359ad2c
diff --git a/metadata/md5-cache/net-misc/socat-9999 b/metadata/md5-cache/net-misc/socat-9999
index c97173319527..fdc88cc174fd 100644
--- a/metadata/md5-cache/net-misc/socat-9999
+++ b/metadata/md5-cache/net-misc/socat-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=app-text/yodl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-text/yodl
 DESCRIPTION=Multipurpose relay (SOcket CAT)
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.dest-unreach.org/socat/
 IUSE=libressl ssl readline ipv6 tcpd
 LICENSE=GPL-2
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d80fdf2011d4c89e5a442e5b28bdee1c
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=648b0f1110af95d11b5c9c6feb767968
diff --git a/metadata/md5-cache/net-misc/wget-1.20.3 b/metadata/md5-cache/net-misc/wget-1.20.3
new file mode 100644
index 000000000000..25cf73c894b7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.20.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+DESCRIPTION=Network utility to retrieve files from the WWW
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/wget/
+IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://gnu/wget/wget-1.20.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=21ae18d17e8e715096f0a47588e884bf
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 622285cf052a..c0d0d5acf71f 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/iwd-0.16 b/metadata/md5-cache/net-wireless/iwd-0.16
new file mode 100644
index 000000000000..67f2a826e24c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-0.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Wireless daemon for linux
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.16.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dad8b640aa52fa729d1748a53545a1b4
diff --git a/metadata/md5-cache/net-wireless/iwd-9999 b/metadata/md5-cache/net-wireless/iwd-9999
index 6db2f4c6089c..8c783c846091 100644
--- a/metadata/md5-cache/net-wireless/iwd-9999
+++ b/metadata/md5-cache/net-wireless/iwd-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6884b74f81c84bce19ba859e4df7cfe5
+_md5_=dad8b640aa52fa729d1748a53545a1b4
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 82f99adaebd7..83244abd12e9 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.5 b/metadata/md5-cache/sci-geosciences/gpxsee-7.5
new file mode 100644
index 000000000000..0874436d0924
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/linguist-tools:5
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=6
+HOMEPAGE=http://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/7.5.tar.gz -> gpxsee-7.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ff5e55094c7dd9a269eacd24e1031335
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.3 b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.3
new file mode 100644
index 000000000000..166f6bb042aa
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GPS mapping utility
+EAPI=6
+HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib
+SLOT=0
+SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.12.3.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=3ef7a56283208bb5fa799d2b2c7b3bd1
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 6d22f827c590..855046d5afbd 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-9999 b/metadata/md5-cache/sec-policy/apparmor-profiles-9999
new file mode 100644
index 000000000000..1799d27ae820
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/apparmor-profiles-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install setup unpack
+DESCRIPTION=A collection of profiles for the AppArmor application security system
+EAPI=7
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=minimal vanilla
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9
+_md5_=fcff07ca576cd4f9e5784a965c6769ec
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5849a93c659d..fb300eb78f6a 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.12-r2 b/metadata/md5-cache/sys-apps/dbus-1.12.12-r2
new file mode 100644
index 000000000000..36715ebab39d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.12-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/xmlto app-text/docbook-xml-dtd:4.4 <sys-devel/autoconf-archive-2019.01.06 virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-libs/glib-2.40:2 )
+DESCRIPTION=A message bus system, a simple way for applications to talk to each other
+EAPI=7
+HOMEPAGE=https://dbus.freedesktop.org/
+IUSE=debug doc elogind kernel_linux selinux static-libs systemd test user-session X kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( AFL-2.1 GPL-2 )
+RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sec-policy/selinux-dbus )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.12.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=14cb8a125fa8333e00c47cca4b6306eb
diff --git a/metadata/md5-cache/sys-apps/systemd-241-r1 b/metadata/md5-cache/sys-apps/systemd-241-r1
index 6371a5436aa3..d3299c0f18d7 100644
--- a/metadata/md5-cache/sys-apps/systemd-241-r1
+++ b/metadata/md5-cache/sys-apps/systemd-241-r1
@@ -5,7 +5,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v241/systemd-241.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=93293cba3ae14acc4d6ed1ffe810e98b
+_md5_=fea4454d9ffcc180e51450feac295045
diff --git a/metadata/md5-cache/sys-apps/systemd-242_rc3 b/metadata/md5-cache/sys-apps/systemd-242_rc3
new file mode 100644
index 000000000000..b942f6cadfd4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-242_rc3
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v242-rc3/systemd-242-rc3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=3dcbfd463300207c4e84098fdcba5b62
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index ad9f1927f370..bfee4bf0a723 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
 DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
 EAPI=7
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=bd48546e6185d27fd1274904542be96e
+_md5_=3dcbfd463300207c4e84098fdcba5b62
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f91fbb9921fe..3e275589c49b 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/keystone-14.1.0 b/metadata/md5-cache/sys-auth/keystone-14.1.0
new file mode 100644
index 000000000000..e78f6ff50e65
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/keystone-14.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=The Openstack authentication, authorization, and service catalog
+EAPI=6
+HOMEPAGE=https://launchpad.net/keystone
+IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-14.1.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-14.1.0 https://tarballs.openstack.org/keystone/keystone-14.1.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=056edc37ebadd6987f27aa7ad09f7a65
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 93b7001aa3bf..c9b2ec4e3f64 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.72 b/metadata/md5-cache/sys-block/tgt-1.0.72
deleted file mode 100644
index 973d1110a475..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.72
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=5
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.72 -> tgt-1.0.72.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e98a000e4cdf7f428c9b9740ec04237
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.73 b/metadata/md5-cache/sys-block/tgt-1.0.73
deleted file mode 100644
index 7fd0f921db09..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.73
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=6
-HOMEPAGE=http://stgt.sourceforge.net
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.73 -> tgt-1.0.73.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afb2662951c837e11268630c7804d941
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.75 b/metadata/md5-cache/sys-block/tgt-1.0.75
index 6910332034d0..f534b6de92af 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.75
+++ b/metadata/md5-cache/sys-block/tgt-1.0.75
@@ -4,10 +4,10 @@ DESCRIPTION=Linux SCSI target framework (tgt)
 EAPI=7
 HOMEPAGE=http://stgt.sourceforge.net
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.75 -> tgt-1.0.75.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=fff854747fbeb6d71c3cdd3a6727bca4
+_md5_=b61dff6418f270311013c3835827e936
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.76 b/metadata/md5-cache/sys-block/tgt-1.0.76
new file mode 100644
index 000000000000..41694ef577c7
--- /dev/null
+++ b/metadata/md5-cache/sys-block/tgt-1.0.76
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets
+DESCRIPTION=Linux SCSI target framework (tgt)
+EAPI=7
+HOMEPAGE=http://stgt.sourceforge.net
+IUSE=fcoe fcp ibmvio infiniband rbd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) app-text/docbook-xsl-stylesheets dev-libs/libaio sys-apps/sg3_utils
+SLOT=0
+SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.76 -> tgt-1.0.76.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=b8ac3a0ce45151abce81b2241bcb76fc
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index bdc31d92d6a7..622cf82b4f5e 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
index 097f2ecb884e..7cb03188dec7 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a261b96ba8362efb127bc5865220ee0a
+_md5_=83a6344c0b57935ed53eaa3110dcc556
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 1bc53efbefb6..7666219535f0 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r1 b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r2
similarity index 99%
rename from metadata/md5-cache/sys-cluster/ceph-13.2.5-r1
rename to metadata/md5-cache/sys-cluster/ceph-13.2.5-r2
index d07de400dfb7..b547e4e19c74 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r2
@@ -12,4 +12,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.5.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7f4569b643a7604a9a4edfd224081b3e
+_md5_=3aeb39e047da73ca14d89daa3cf4db46
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.0-r3 b/metadata/md5-cache/sys-cluster/ceph-14.2.0-r4
similarity index 99%
rename from metadata/md5-cache/sys-cluster/ceph-14.2.0-r3
rename to metadata/md5-cache/sys-cluster/ceph-14.2.0-r4
index eb3a5c20bd54..da1082dc67c8 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.0-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.0-r4
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0fce009f6e5a548267727b4752dcfdd0
+_md5_=b46ecdc101e84fb0a7fe8e5d2d4b505f
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.23 b/metadata/md5-cache/sys-cluster/galera-25.3.23
deleted file mode 100644
index f68164429072..000000000000
--- a/metadata/md5-cache/sys-cluster/galera-25.3.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
-EAPI=6
-HOMEPAGE=http://galeracluster.com
-IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
-SLOT=0
-SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5641d94d3fa77bfb9690832f3669bf56
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.24 b/metadata/md5-cache/sys-cluster/galera-25.3.24
deleted file mode 100644
index 7f720ebc90b4..000000000000
--- a/metadata/md5-cache/sys-cluster/galera-25.3.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare
-DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
-EAPI=6
-HOMEPAGE=http://galeracluster.com
-IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 BSD
-RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
-SLOT=0
-SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78b7c0c65d6127ba24105c0419354987
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.26 b/metadata/md5-cache/sys-cluster/galera-25.3.26
new file mode 100644
index 000000000000..1792fa3a745d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.26
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/scons[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
+EAPI=7
+HOMEPAGE=http://galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
+SLOT=0
+SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/galera-25.3.26/src/galera-25.3.26.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=ecb21b53f6c99511910bd8bcb793de9c
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.26.4 b/metadata/md5-cache/sys-cluster/gasnet-1.26.4
index 4f95baeb53cf..1baa7022d396 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.26.4
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.26.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Networking middleware for partitioned global address space (PGAS) language
 EAPI=6
-HOMEPAGE=http://gasnet.lbl.gov/
+HOMEPAGE=https://gasnet.lbl.gov/
 IUSE=mpi threads
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
-SRC_URI=http://gasnet.lbl.gov/GASNet-1.26.4.tar.gz
+SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.26.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=e1108fabf6e5171ec7d87abd600e29ad
+_md5_=64943711c1aaa000b615185414d7ca2e
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1 b/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
index 0db2a794b910..f8143af73d8b 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
 DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Networking middleware for partitioned global address space (PGAS) language
 EAPI=6
-HOMEPAGE=http://gasnet.lbl.gov/
+HOMEPAGE=https://gasnet.lbl.gov/
 IUSE=mpi static-libs threads
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0/1
-SRC_URI=http://gasnet.lbl.gov/GASNet-1.26.4.tar.gz
+SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.26.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=3d4b3ea83c6b744d7ac1037ab55f989b
+_md5_=1b62944a3d9195863f7b1b58c0d66917
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.28.0 b/metadata/md5-cache/sys-cluster/gasnet-1.28.0
index 85fbf1925877..2b9f33c7faf1 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.28.0
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.28.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Networking middleware for partitioned global address space (PGAS) language
 EAPI=6
-HOMEPAGE=http://gasnet.lbl.gov/
+HOMEPAGE=https://gasnet.lbl.gov/
 IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0/1.28.0
-SRC_URI=http://gasnet.lbl.gov/GASNet-1.28.0.tar.gz
+SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.28.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=50db9c54ec82520d506eaa3416f1bbfd
+_md5_=75289b4e35309f774ab3443fe97c75f2
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.28.2 b/metadata/md5-cache/sys-cluster/gasnet-1.28.2
index d8691c2e8bdc..e68a9792b464 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.28.2
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.28.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Networking middleware for partitioned global address space (PGAS) language
 EAPI=6
-HOMEPAGE=http://gasnet.lbl.gov/
+HOMEPAGE=https://gasnet.lbl.gov/
 IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0/1.28.2
-SRC_URI=http://gasnet.lbl.gov/GASNet-1.28.2.tar.gz
+SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.28.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=58149b20c944472b71ba85146cea1138
+_md5_=d20106b75f5dc4ae633434b57fa96b16
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.30.0 b/metadata/md5-cache/sys-cluster/gasnet-1.30.0
index 71cbd6acc37f..fac376a52077 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.30.0
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.30.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=mpi? ( virtual/mpi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Networking middleware for partitioned global address space (PGAS) language
 EAPI=6
-HOMEPAGE=http://gasnet.lbl.gov/
+HOMEPAGE=https://gasnet.lbl.gov/
 IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0/1.30.0
-SRC_URI=http://gasnet.lbl.gov/GASNet-1.30.0.tar.gz
+SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.30.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=58149b20c944472b71ba85146cea1138
+_md5_=d20106b75f5dc4ae633434b57fa96b16
diff --git a/metadata/md5-cache/sys-cluster/swift-2.21.0 b/metadata/md5-cache/sys-cluster/swift-2.21.0-r1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/swift-2.21.0
rename to metadata/md5-cache/sys-cluster/swift-2.21.0-r1
index 7e590d394a23..3821df240090 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.21.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.21.0-r1
@@ -3,7 +3,7 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=6
 HOMEPAGE=https://launchpad.net/swift
-IUSE=proxy account container object +memcached python_targets_python2_7 kernel_linux
+IUSE=account container doc +memcached object proxy python_targets_python2_7 kernel_linux
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.21.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8d2e85d74617962ac9f467ccfdcf1619
+_md5_=7e756d61838e34b61e3874992f28c868
diff --git a/metadata/md5-cache/sys-cluster/swift-2019.1.9999 b/metadata/md5-cache/sys-cluster/swift-2019.1.9999
index bad1b7d94f77..f75db621898a 100644
--- a/metadata/md5-cache/sys-cluster/swift-2019.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2019.1.9999
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=6
 HOMEPAGE=https://launchpad.net/swift
-IUSE=proxy account container object +memcached python_targets_python2_7 kernel_linux
+IUSE=account container doc +memcached object proxy python_targets_python2_7 kernel_linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8d2e85d74617962ac9f467ccfdcf1619
+_md5_=7e756d61838e34b61e3874992f28c868
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1ed30798fe2d..7e121ee0876d 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.1-r4 b/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
index e3b1407e7c98..4b5559dd85c9 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6016a55a38e632ca77626504dd560bb4
+_md5_=e3dcf409c9ceb79ccff20aafa19724cf
diff --git a/metadata/md5-cache/sys-devel/llvm-8.0.0-r1 b/metadata/md5-cache/sys-devel/llvm-8.0.0-r1
new file mode 100644
index 000000000000..f34682290094
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-8.0.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) kernel_Darwin? ( <sys-libs/libcxx-8.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-8 )
+RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
+RESTRICT=!test? ( test )
+SLOT=8
+SRC_URI=https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.0-manpages.tar.bz2 )
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e247211474f79a3a1c1383fb8cf5efc1
diff --git a/metadata/md5-cache/sys-devel/smatch-9999 b/metadata/md5-cache/sys-devel/smatch-9999
index 4582e6dd5f37..6268c8f3935d 100644
--- a/metadata/md5-cache/sys-devel/smatch-9999
+++ b/metadata/md5-cache/sys-devel/smatch-9999
@@ -1,10 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-db/sqlite >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-db/sqlite
 DESCRIPTION=static analysis tool for C
-EAPI=4
+EAPI=7
 HOMEPAGE=http://smatch.sourceforge.net/
 LICENSE=OSL-1.1
 RDEPEND=dev-db/sqlite
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=56543250af4c114a7bbb389c4ddaab5c
+_md5_=ef2a31d9046422a5dc5247a4585fc6bf
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 85398286e42a..f457a50c600c 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.103 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.103
deleted file mode 100644
index 0e61ae0ee52d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.103
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.103
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-109.base.tar.xz mirror://gentoo/genpatches-4.14-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-109.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f5d1169bf904622f8fc79bb9310dd8f2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.104 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.104
deleted file mode 100644
index 9702258e6bc5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.104
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.104
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-110.base.tar.xz mirror://gentoo/genpatches-4.14-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-110.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=58ba1e250c8455c01d5b57c3e6c8e415
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105
deleted file mode 100644
index 079577598ada..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.105
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-111.base.tar.xz mirror://gentoo/genpatches-4.14-111.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-111.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=42e84f8f7f50c75cd91928d4b5361305
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.106 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.106
deleted file mode 100644
index 888bc1f4e85f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.106
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.106
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-113.base.tar.xz mirror://gentoo/genpatches-4.14-113.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-113.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=16ba93a89de244bd1c9021b647216bfc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.107 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.107
deleted file mode 100644
index f2d0bd828feb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.107
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-114.base.tar.xz mirror://gentoo/genpatches-4.14-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-114.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=e3d2c6a337784304992a55341e127dba
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.108 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.108
deleted file mode 100644
index 244654af9d78..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.108
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.108
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-116.base.tar.xz mirror://gentoo/genpatches-4.14-116.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-116.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f7d06a390bfd4992e17eb7b0f44d1324
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.28 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.28
deleted file mode 100644
index 10e6f1bb3ded..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.28
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.28
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-29.base.tar.xz mirror://gentoo/genpatches-4.19-29.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-29.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=2cc5e4226e7671061d5659d5d428c569
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.29 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.29
deleted file mode 100644
index 68f65d9cf5d7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.29
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-30.base.tar.xz mirror://gentoo/genpatches-4.19-30.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-30.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=3ae6fe5546dd6c740909d22a0f49b774
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.30 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.30
deleted file mode 100644
index 51a05bb4243d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.30
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-31.base.tar.xz mirror://gentoo/genpatches-4.19-31.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-31.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=ca1fa10bea5020600318122b2f1bb213
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.31 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.31
deleted file mode 100644
index ef9808714a9f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.31
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-32.base.tar.xz mirror://gentoo/genpatches-4.19-32.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-32.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=898a6fdf23622ae9c854fe92d25376ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.160 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.160
deleted file mode 100644
index c1349ddfdaa7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.160
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.160
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-162.base.tar.xz mirror://gentoo/genpatches-4.9-162.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-162.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f2f3d8e0b4771efd590261b000926d82
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.161 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.161
deleted file mode 100644
index a039997ce71e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.161
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.161
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-163.base.tar.xz mirror://gentoo/genpatches-4.9-163.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-163.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=2d8e98d45793cdb81b0159ea497fe53e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162
deleted file mode 100644
index db709738caa8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.162
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.162
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-164.base.tar.xz mirror://gentoo/genpatches-4.9-164.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-164.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=37d0e759cc335ae76cae555bcf7e0ba3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.163 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.163
deleted file mode 100644
index 9b7dccc7dc5c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.163
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.163
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-166.base.tar.xz mirror://gentoo/genpatches-4.9-166.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-166.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f42a3a4f085ee26bc7cefeab6e9493ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.164 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.164
deleted file mode 100644
index 06644ada9ae7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.164
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.164
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-167.base.tar.xz mirror://gentoo/genpatches-4.9-167.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-167.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=d48049c61fbdcd8830a2ec1c8a6ccc20
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.165 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.165
deleted file mode 100644
index c51a98e60e25..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.165
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.165
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-169.base.tar.xz mirror://gentoo/genpatches-4.9-169.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-169.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=70fabbd4eeae1d3225d302ffc4938253
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.1
deleted file mode 100644
index 9c9689c8b0ad..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.0 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.0.1
-SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-2.base.tar.xz mirror://gentoo/genpatches-5.0-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-2.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=66610594ee63ca46306cbbd073ab8b61
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.2
deleted file mode 100644
index 801871028097..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.0 kernel tree
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.0.2
-SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-3.base.tar.xz mirror://gentoo/genpatches-5.0-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-3.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=b64d48063bacc264faf8d5899e1a58d6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.6
similarity index 82%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.0.0
rename to metadata/md5-cache/sys-kernel/gentoo-sources-5.0.6
index ded8e28b51e9..0d679c8d953c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.6
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.0.0
-SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-1.base.tar.xz mirror://gentoo/genpatches-5.0-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-1.experimental.tar.xz )
+SLOT=5.0.6
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-7.base.tar.xz mirror://gentoo/genpatches-5.0-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-7.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=106686be70c8852c8b705f95ea74a6e1
+_md5_=601ff7c23e8ffe7fd235dcf65a56cb59
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.64 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.65
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.16.64
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.16.65
index 37233a8feb7f..f5d27c00a592 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.64
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.65
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=3.16.64
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.64.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
+SLOT=3.16.65
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.65.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.17
deleted file mode 100644
index 7c2392bc83b1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20.17
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.20.17.xz mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2257c25e64d1..72452f922a82 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4 b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
index 34b2c1c420aa..048bc225ff0b 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.31.1-r1
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7056ae29e97c83777d4d69ea851b012
+_md5_=7f2315cbd89bb8766b3f2717f749325e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e06a1765fc6e..fbbde9aedc58 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/rtirq-20150216 b/metadata/md5-cache/sys-process/rtirq-20150216
index 5f174492daa1..6dc2ff6072d4 100644
--- a/metadata/md5-cache/sys-process/rtirq-20150216
+++ b/metadata/md5-cache/sys-process/rtirq-20150216
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Modify realtime scheduling policy and priority of IRQ handlers
 EAPI=6
-HOMEPAGE=http://www.rncbc.org/archive/#rtirq
+HOMEPAGE=https://www.rncbc.org/archive/#rtirq
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.13
 SLOT=0
-SRC_URI=http://www.rncbc.org/archive/rtirq-20150216.tar.gz
-_md5_=1961bab362359a05477fd4f1c4a63d26
+SRC_URI=https://www.rncbc.org/archive/old/rtirq-20150216.tar.gz
+_md5_=3e29fad82d95912ace38b886c0f758eb
diff --git a/metadata/md5-cache/sys-process/rtirq-20180209 b/metadata/md5-cache/sys-process/rtirq-20180209
index ea07b23fef44..9f09c67a344f 100644
--- a/metadata/md5-cache/sys-process/rtirq-20180209
+++ b/metadata/md5-cache/sys-process/rtirq-20180209
@@ -2,11 +2,11 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Modify realtime scheduling policy and priority of IRQ handlers
 EAPI=7
-HOMEPAGE=http://www.rncbc.org/archive/#rtirq
+HOMEPAGE=https://www.rncbc.org/archive/#rtirq
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=http://www.rncbc.org/archive/rtirq-20180209.tar.gz
+SRC_URI=https://www.rncbc.org/archive/old/rtirq-20180209.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=293fd89ce465926c1dc7eb17757ef73d
+_md5_=69db64712cd70cb0e9aec93e134c4b99
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e12967f2a1cc..d4d91d7dbdc3 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/owncloud-10.1.1 b/metadata/md5-cache/www-apps/owncloud-10.1.1
new file mode 100644
index 000000000000..aef8aab4deb8
--- /dev/null
+++ b/metadata/md5-cache/www-apps/owncloud-10.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based storage application where all your data is under your own control
+EAPI=6
+HOMEPAGE=https://owncloud.org
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=10.1.1
+SRC_URI=https://download.owncloud.org/community/owncloud-10.1.1.tar.bz2 -> owncloud-10.1.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=7098b04cbe49057cfc7e8aaafa5e740f
diff --git a/metadata/md5-cache/www-apps/roundup-1.6.0 b/metadata/md5-cache/www-apps/roundup-1.6.0-r1
similarity index 96%
rename from metadata/md5-cache/www-apps/roundup-1.6.0
rename to metadata/md5-cache/www-apps/roundup-1.6.0-r1
index 90f6090ea351..f4bd2c009fd2 100644
--- a/metadata/md5-cache/www-apps/roundup-1.6.0
+++ b/metadata/md5-cache/www-apps/roundup-1.6.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-1.6.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=de8aaa5f2b3981022035fc3d41ff4311
+_md5_=b29b234a1a4d2137935cee92d9643aaa
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 3920f884741e..c491892d574b 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-60.5.2 b/metadata/md5-cache/www-client/firefox-60.5.2
deleted file mode 100644
index beec2cd08334..000000000000
--- a/metadata/md5-cache/www-client/firefox-60.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ach.xpi -> firefox-60.5.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/af.xpi -> firefox-60.5.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/an.xpi -> firefox-60.5.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ar.xpi -> firefox-60.5.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/as.xpi -> firefox-60.5.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ast.xpi -> firefox-60.5.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/az.xpi -> firefox-60.5.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/bg.xpi -> firefox-60.5.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.5.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.5.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/br.xpi -> firefox-60.5.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/bs.xpi -> firefox-60.5.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ca.xpi -> firefox-60.5.2esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/cak.xpi -> firefox-60.5.2esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/cs.xpi -> firefox-60.5.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/cy.xpi -> firefox-60.5.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/da.xpi -> firefox-60.5.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/de.xpi -> firefox-60.5.2esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/dsb.xpi -> firefox-60.5.2esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/el.xpi -> firefox-60.5.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/en-GB.xpi -> firefox-60.5.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.5.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/eo.xpi -> firefox-60.5.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/es-AR.xpi -> firefox-60.5.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/es-CL.xpi -> firefox-60.5.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/es-ES.xpi -> firefox-60.5.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/es-MX.xpi -> firefox-60.5.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/et.xpi -> firefox-60.5.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/eu.xpi -> firefox-60.5.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/fa.xpi -> firefox-60.5.2esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ff.xpi -> firefox-60.5.2esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/fi.xpi -> firefox-60.5.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/fr.xpi -> firefox-60.5.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.5.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.5.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/gd.xpi -> firefox-60.5.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/gl.xpi -> firefox-60.5.2esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/gn.xpi -> firefox-60.5.2esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.5.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/he.xpi -> firefox-60.5.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.5.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/hr.xpi -> firefox-60.5.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/hsb.xpi -> firefox-60.5.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/hu.xpi -> firefox-60.5.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.5.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/id.xpi -> firefox-60.5.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/is.xpi -> firefox-60.5.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/it.xpi -> firefox-60.5.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ja.xpi -> firefox-60.5.2esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ka.xpi -> firefox-60.5.2esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/kab.xpi -> firefox-60.5.2esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/kk.xpi -> firefox-60.5.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/km.xpi -> firefox-60.5.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/kn.xpi -> firefox-60.5.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ko.xpi -> firefox-60.5.2esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/lij.xpi -> firefox-60.5.2esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/lt.xpi -> firefox-60.5.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/lv.xpi -> firefox-60.5.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/mai.xpi -> firefox-60.5.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/mk.xpi -> firefox-60.5.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ml.xpi -> firefox-60.5.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/mr.xpi -> firefox-60.5.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ms.xpi -> firefox-60.5.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.5.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/nl.xpi -> firefox-60.5.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.5.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/or.xpi -> firefox-60.5.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.5.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/pl.xpi -> firefox-60.5.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.5.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.5.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/rm.xpi -> firefox-60.5.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ro.xpi -> firefox-60.5.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ru.xpi -> firefox-60.5.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/si.xpi -> firefox-60.5.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/sk.xpi -> firefox-60.5.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/sl.xpi -> firefox-60.5.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/son.xpi -> firefox-60.5.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/sq.xpi -> firefox-60.5.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/sr.xpi -> firefox-60.5.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.5.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/ta.xpi -> firefox-60.5.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/te.xpi -> firefox-60.5.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/th.xpi -> firefox-60.5.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/tr.xpi -> firefox-60.5.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/uk.xpi -> firefox-60.5.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/uz.xpi -> firefox-60.5.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/vi.xpi -> firefox-60.5.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/xh.xpi -> firefox-60.5.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.5.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.5.2esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.5.2esr/source/firefox-60.5.2esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.5-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	2b2bb73f0d7c508d096467e6abe5c812	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e1d67ead3c19a52efedd4e7224ea5b40
diff --git a/metadata/md5-cache/www-client/firefox-60.6.0 b/metadata/md5-cache/www-client/firefox-60.6.0
deleted file mode 100644
index 0a2a7e76159b..000000000000
--- a/metadata/md5-cache/www-client/firefox-60.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ach.xpi -> firefox-60.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/af.xpi -> firefox-60.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/an.xpi -> firefox-60.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ar.xpi -> firefox-60.6.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/as.xpi -> firefox-60.6.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ast.xpi -> firefox-60.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/az.xpi -> firefox-60.6.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/bg.xpi -> firefox-60.6.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.6.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.6.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/br.xpi -> firefox-60.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/bs.xpi -> firefox-60.6.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ca.xpi -> firefox-60.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/cak.xpi -> firefox-60.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/cs.xpi -> firefox-60.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/cy.xpi -> firefox-60.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/da.xpi -> firefox-60.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/de.xpi -> firefox-60.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/dsb.xpi -> firefox-60.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/el.xpi -> firefox-60.6.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.6.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.6.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/eo.xpi -> firefox-60.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/et.xpi -> firefox-60.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/eu.xpi -> firefox-60.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/fa.xpi -> firefox-60.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ff.xpi -> firefox-60.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/fi.xpi -> firefox-60.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/fr.xpi -> firefox-60.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/gd.xpi -> firefox-60.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/gl.xpi -> firefox-60.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/gn.xpi -> firefox-60.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/he.xpi -> firefox-60.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/hr.xpi -> firefox-60.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/hu.xpi -> firefox-60.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.6.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/id.xpi -> firefox-60.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/is.xpi -> firefox-60.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/it.xpi -> firefox-60.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ja.xpi -> firefox-60.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ka.xpi -> firefox-60.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/kab.xpi -> firefox-60.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/kk.xpi -> firefox-60.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/km.xpi -> firefox-60.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/kn.xpi -> firefox-60.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ko.xpi -> firefox-60.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/lij.xpi -> firefox-60.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/lt.xpi -> firefox-60.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/lv.xpi -> firefox-60.6.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/mai.xpi -> firefox-60.6.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/mk.xpi -> firefox-60.6.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ml.xpi -> firefox-60.6.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/mr.xpi -> firefox-60.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ms.xpi -> firefox-60.6.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.6.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/nl.xpi -> firefox-60.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.6.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/or.xpi -> firefox-60.6.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/pl.xpi -> firefox-60.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/rm.xpi -> firefox-60.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ro.xpi -> firefox-60.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ru.xpi -> firefox-60.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/si.xpi -> firefox-60.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/sk.xpi -> firefox-60.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/sl.xpi -> firefox-60.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/son.xpi -> firefox-60.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/sq.xpi -> firefox-60.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/sr.xpi -> firefox-60.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/ta.xpi -> firefox-60.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/te.xpi -> firefox-60.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/th.xpi -> firefox-60.6.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/tr.xpi -> firefox-60.6.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/uk.xpi -> firefox-60.6.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/uz.xpi -> firefox-60.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/vi.xpi -> firefox-60.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/xh.xpi -> firefox-60.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.6.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.6.0esr/source/firefox-60.6.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	2b2bb73f0d7c508d096467e6abe5c812	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ed21a2234a69bd545719f2202aba32ad
diff --git a/metadata/md5-cache/www-client/vivaldi-2.4.1488.36_p1 b/metadata/md5-cache/www-client/vivaldi-2.4.1488.36_p1
new file mode 100644
index 000000000000..ef1dccf595aa
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.4.1488.36_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=6
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64 ~arm x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.4.1488.36-1_amd64.deb -> vivaldi-2.4.1488.36_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.4.1488.36-1_armhf.deb -> vivaldi-2.4.1488.36_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.4.1488.36-1_i386.deb -> vivaldi-2.4.1488.36_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b37e1d6394680d0ac49d68329aa524ae
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 4f3747ea8bae..2f052889d556 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.8.1 b/metadata/md5-cache/www-servers/gunicorn-19.8.1
index 335102be4881..a49de4c81e9a 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.8.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.8.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A WSGI HTTP Server for UNIX
 EAPI=6
-HOMEPAGE=http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn
+HOMEPAGE=https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT PSF-2 doc? ( BSD )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.8.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7852399c37ec9c973ebf4b4ca176c8fc
+_md5_=a48d3e2542e63a81f93adfd20828c3f0
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b2b540b4de44..9f66188c63c1 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.1 b/metadata/md5-cache/x11-misc/rofi-1.5.1
index 095d56864e85..373489075c7c 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.1
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=6
-HOMEPAGE=https://github.com/DaveDavenport/rofi/
+HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=test windowmode
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
-SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.1/rofi-1.5.1.tar.xz
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.1/rofi-1.5.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=84c5a23bc06ff2d267e29a38b43fba06
+_md5_=0a387aa2544f5d0361273774bfe684f6
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.2 b/metadata/md5-cache/x11-misc/rofi-1.5.2
index 5760cabe2243..d7dfbf7c44ea 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.2
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.2
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=7
-HOMEPAGE=https://github.com/DaveDavenport/rofi/
+HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=test windowmode
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
-SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.2/rofi-1.5.2.tar.xz
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.2/rofi-1.5.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4b74f8a5198f0eb7003dc2fda042e01d
+_md5_=294a67c8d8730d2cb66448aeccd4c99c
diff --git a/metadata/md5-cache/x11-misc/rofi-99999 b/metadata/md5-cache/x11-misc/rofi-99999
index 53b079f33d40..36cbb95920a4 100644
--- a/metadata/md5-cache/x11-misc/rofi-99999
+++ b/metadata/md5-cache/x11-misc/rofi-99999
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure prepare unpack
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=7
-HOMEPAGE=https://github.com/DaveDavenport/rofi/
+HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=test windowmode
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=140adcc3e59329d7a7bdd4335ac3bd99
+_md5_=b0cc6d30576b064dfecbfc2217f7cb30
diff --git a/metadata/md5-cache/x11-misc/xcalib-0.10 b/metadata/md5-cache/x11-misc/xcalib-0.10
new file mode 100644
index 000000000000..0afbd9b48114
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xcalib-0.10
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm x11-base/xorg-proto x11-libs/libXext
+DESCRIPTION=Tiny monitor calibration loader for X.org
+EAPI=7
+HOMEPAGE=https://github.com/OpenICC/xcalib
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=https://github.com/OpenICC/xcalib/archive/0.10.tar.gz -> xcalib-0.10.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a82ef92778cdc448fd9aabc450d2e575
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index c47b1274658e..223ebf4bdf6a 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
index c717c46f5fbd..7ba041a2ec6f 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Official GTK+:3 port of KDE's Oxygen widget style
-EAPI=6
-HOMEPAGE=https://store.kde.org/content/show.php/?content=136216
+EAPI=7
+HOMEPAGE=https://store.kde.org/p/1005553/
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=3
 SRC_URI=mirror://kde/stable/oxygen-gtk3/1.4.1/src/oxygen-gtk3-1.4.1.tar.bz2
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=17ad1ca64792e5d25e09467748b8d82b
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=7c0769a084b7dacfc645a7798e26889f
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
index 85fd70051bef..e270a9a72ce5 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Official GTK+:2 port of KDE's Oxygen widget style
-EAPI=6
-HOMEPAGE=https://store.kde.org/content/show.php/?content=136216
+EAPI=7
+HOMEPAGE=https://store.kde.org/p/1005553/
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=2
 SRC_URI=mirror://kde/stable/oxygen-gtk2/1.4.6/src/oxygen-gtk2-1.4.6.tar.bz2
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fd9db237f92c0473fb3f89bbee1b811b
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=63eb7beb286edfef61081538a5355881
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d5ac72ff4a72..65b9fa6158fa 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Apr 2019 18:08:44 +0000
+Fri, 05 Apr 2019 13:08:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b5b9091e8bc9..20c408d0cb7b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr  3 18:08:44 UTC 2019
+Fri Apr  5 13:08:44 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 29a4ed469ce8..77a952461f99 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Apr 2019 18:30:01 +0000
+Fri, 05 Apr 2019 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b7e10053b3c6..3f7575385098 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d9e97d0f674df9ddc7c1d0d64b736a3ccb9b277a 1554314527 2019-04-03T18:02:07+00:00
+eba3f2577b710c91c43ecff2e3527b2c5925379d 1554468353 2019-04-05T12:45:53+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ae35dbe2096e..e919ce5d8d96 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1554314701 Wed 03 Apr 2019 06:05:01 PM UTC
+1554469501 Fri 05 Apr 2019 01:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d5ac72ff4a72..73017742061c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 03 Apr 2019 18:08:44 +0000
+Fri, 05 Apr 2019 13:08:44 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 4129c4411038..72fd8b9e5a03 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
index 276687b352d9..84bb1a6f1a22 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/bind-9.12.3_p4.ebuild b/net-dns/bind/bind-9.12.3_p4.ebuild
index 214450407536..a52e3e1d8a37 100644
--- a/net-dns/bind/bind-9.12.3_p4.ebuild
+++ b/net-dns/bind/bind-9.12.3_p4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6
 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
new file mode 100644
index 000000000000..7f11cfca787b
--- /dev/null
+++ b/net-dns/dnsviz/Manifest
@@ -0,0 +1 @@
+DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
diff --git a/net-dns/dnsviz/dnsviz-0.8.2.ebuild b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
new file mode 100644
index 000000000000..74b6aa78b4b8
--- /dev/null
+++ b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1 eutils
+
+DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
+HOMEPAGE="http://dnsviz.net/"
+SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/m2crypto-0.31.0[${PYTHON_USEDEP}]
+	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	${DEPEND}"
+
+python_prepare_all() {
+	# Fix the ebuild to use correct FHS/Gentoo policy paths for 0.8.2
+	sed -i "s*share/doc/dnsviz*share/doc/dnsviz-${PV}*g" "${S}"/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "Support for extra feature can be get from:"
+	optfeature "Support for pre-deployment testing" net-dns/bind
+
+	# Warn about extra requirements for >=OpenSSL 1.1.0
+	if has_version '=dev-libs/openssl-1.1*'; then
+	   echo
+	   ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
+	   ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
+	   ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
+	   ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
+	fi
+}
diff --git a/net-dns/dnsviz/metadata.xml b/net-dns/dnsviz/metadata.xml
new file mode 100644
index 000000000000..c1ee72309eb6
--- /dev/null
+++ b/net-dns/dnsviz/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	DNSViz is a tool suite for analysis and visualization of Domain Name 
+	System (DNS) behavior, including its security extensions (DNSSEC).
+	This tool suite powers the Web-based analysis.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dnsviz/dnsviz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index eaad90fc8500..72e3d31a0a02 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index 0b1ed34930dd..61ca214cf060 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -1,3 +1,30 @@
+DIST github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz 11788 BLAKE2B c7726ecd41c5d8909e157a38db429327d09873b4a4661cb7607893067c362487339b33eb24f122df7ea98e81bd4556884b831014a6948a108b74c71f521f1296 SHA512 47f0985138603631d59915b01fc99b4d4fc44ea964e1ad50b472cabec0fdf57f6235dc05ad32629bc086bc3f1fe25c2a3a31be064f91d398fdf37799fe4aa8db
+DIST github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz 17263 BLAKE2B 6915367735a060d873947d805b49b1a6900080019cd5c21183c11850a0fb5292ea6c93576d7bbc8939e6b0f1e31501c44b38e5c97c09fb5685053b50142de092 SHA512 713ed1188affab7954efd4a6656d0bc82368b2c71e5604afbdcf9ea1ead401b821c443d5cd1c634964139d76fcf69d9a4b0efec4079f0b2335b1c15ca042d0b2
+DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d
+DIST github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz 35081 BLAKE2B 7adf1e84f4fb23632f9bbeaa53e3d5b6a12244999cc5b744f12439459be4921a271d85e3e2dfbec08fa12b1dec27016e78805c600d7d4798bb84aaef5756e49b SHA512 b2758ad40b532e30581f41b2cf609042388acfb037848858c394c0edf444181942061fceba6be76aa7913e62954cc14552ace7b4634d731a6bbe473275655aee
+DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee
+DIST github.com-golang-net-b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz 976663 BLAKE2B 6eadc2d2da8ae01bc77d896ea8073377190366bacc5da127bd4c93fd2e2163493ca0222d58ce6133444daba89bba328a12d557b2a5b395c3d05a701d037c5f07 SHA512 c0ebb41e39f0289d935dbbc196080e5c9d7d6f25901e47d8a23e8a63a22b89a6539ea1b4e85ecff7e2fc930654f7f1a85096fb18b1a9d6a9dd86fa6b134f154a
+DIST github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz 1262962 BLAKE2B 082ce1d2924efe2090c735b5338b4afb24cee1109d445ad12241fba95413fdbb5a1b5ed3425d4822a610b38cdf2fad7d3fa5af2d306ab396746fa38d1d11195a SHA512 04cda320e2c5c5dad102657725d3c94289937194836c28c4633b150fcb691123b12f8eeeb8538f76e747c5626ccb9dc12667fce362b96448195a9cc332045db2
+DIST github.com-golang-text-6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz 6585336 BLAKE2B 1650f1389b0f31a9177f203fc1c4eeb4fe734f5c21713223cd76bd556b21a6ba4c35295f1997051ec3936f56bef51012a8aac592f5ffe7c43f6bc7fb2d755adb SHA512 92031dc6e2ad393926e5b65e9bdd494735159d13821ec6f7642414b9ae023b08838af277ef648c35353e8c2950f0a21bc418af144291aa8b69e099aecdc42241
+DIST github.com-h2non-filetype-cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz 686090 BLAKE2B bc657b96f624b5f189603d052cea2fd3ae781009639db200d486a3e0e63b6de888db5fd9673b9e772b7215ebaf7a195cd5cb3275472bcc0ab84cfd9a82e7081d SHA512 6355a944ed19c254112c90f1e2048bdcdf9e63b59a59ba51288e729484538b2bab7f4ebe80e629df993456431ce2aec5502cc1cc3273919e023da3da651430a6
+DIST github.com-hashicorp-errwrap-8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz 8348 BLAKE2B 1c6dc8b0cd7ba0daa33df47056af538fd289b05c0efd72684d088f0043ef057ef6c5a6089d62bd99d17c57bf840370c319cd1201df54cac395d589322f7ce60b SHA512 f2b676d8728965e320f99444e2ab8ed3aa609f0714d7424ee576548260c2d5be5f6ea09397554d7dbfae73b51b23a4d14ff6d9385e6b25ac68fd40e8f535780b
+DIST github.com-hashicorp-go-multierror-886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz 10070 BLAKE2B 93839f82ee11d020e0ce586c2bc1b2e5d3294dc03b6faa3e62e2ed67c3126e7f96330c358dc54d91ccb9b0351946bb114763ecb38a02176d2844b2d8df3fc96e SHA512 d65e7210502081f927035dfa61b099e67b94a3271f479921c1a48ca079f3ba759f5598d19b5ce9c30c07085fd180d77cacbb1627fde391f49eb0f3ed30c5a35a
+DIST github.com-hashicorp-go-version-d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz 12769 BLAKE2B ec65b37a122c3cd7aa220e980618b7697a9b9aae56febfe025a0df3064f5819c999c36be627bd2c70fd6a96d55ed4071bb79339f30e62cde74ae224200dec8fc SHA512 343a8bb8c7b5d540dfc4dce78dd0681a5f5d24e85de62488fff08e3feb74fb5a5a3827f25a3ec0c1be191e9dcb07969732d34ab7452f4a57e9db05d1eac8524b
+DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
+DIST github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz 27126 BLAKE2B 0972b3af87057486bbb85bf79ed5894eb6531ee9966b8048f0f35baa750a868a697c2103d0f26e5040d96a24ce5a9c4ee0f6ed27e262f4618e2d60165cbdba13 SHA512 6343652b5c8e5056240cc0eafae7c37772a24fd791b8cea44036af502257e403ec374bf224437391da3b596cfe6d6aa1f3889d24e5b62d42e3ddc2fbe66d696e
+DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d
+DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
+DIST github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz 19845 BLAKE2B 5512128da165241ee85c1761d86d8a780f5bb57474c66c49ff796a1a7bd3b59ce1dfc2dae04bf8b032f1939fbceacc60355a0eb9ae1fa4619418ed7b934153c7 SHA512 456bb5314164373c8589109f8333e29c397c44e4d9882b544e86b2870a44d75ba397dfb58287908d305c6928b098097decec753701eba5c17192479c900366ac
+DIST github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz 57326 BLAKE2B 9e82904f852ff05d3809770762f1137116e6e4a421a5b4a9ba483f48b24287a4dfaeaca90bbe738a694b44f010d86c6fe33a2383e9c60bac728b5619071f1bf4 SHA512 e2aeb507392d34fb2908c3426de6b6b5b662ac88534d46a392a463f1447fc9c21945064482c22b02cc2ecc2c889a30e38c37d37b50117a05959b258f60c6de54
+DIST github.com-minio-minio-0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz 9261525 BLAKE2B 9f5c122a3199dd809f8a555c9f2f91a2a7fb0a9a2ea19c57dc3b6bb24a83583ff3f6e3846ca0c9902d8b482e8a51d8895de73a5f2b66339b3fcf7f906898e719 SHA512 e66d1403e97b1b120dc502e715f3c9aa546956973827a9fed26c01d8ae5210ba2969f66957f387fb9876d7a3e55b9350baf32d7fb205a943ae06cf9a034ae5fe
+DIST github.com-minio-minio-go-5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz 190339 BLAKE2B 1a119a8f57742c1336a110458b0c114a618c07dfdc0d70749a7800b101e252da4b58a1103e2bf16ffc5445987a235ea9d57045f08b001ec92df5991725dd9707 SHA512 b1ad2961977572c2195982d170ec93d250304594720d9e4bc8052fd13cd2e3eaa838198d983050dc5e28cc46fbe39b6bbe44be5a1300fed30a7ed1abc5740679
+DIST github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz 64938 BLAKE2B 0e36ec0383b136b0471bfc71dfb5062c7cd1b1d0708f2f5a58ece02a45b819bcd3691d85f35c66ed8a90cb4d362b86182a185916fc29e0c16f39c602fb9894eb SHA512 36330af07ffec389c92f0769bf01188de7156f2d73eeedc03280a1b4000f3a0fed156737c3b1e6554579a7570f156dcd16f52a895b661da51628496221b9b593
+DIST github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz 3362 BLAKE2B 6b6381ba8b7bfa05b0ca04b8492d9f66d0a5c76c41db3476fd0f1fac01ff38f50465953b64f48b00859e28a5725feb056f3c1bfe1234376d00e2e37fd2d71a73 SHA512 049d31e1ebe03ad0f7312819414aefac9958cce3ef14704af32104af6140f31a62a23579a12bed80e8514147ec4a93bec8eaf0f8cba8cceaeecd05d577273b3a
+DIST github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz 5838 BLAKE2B dd40dd8ee0cd6b9c7f4d48a9cd4dfb351fb229bbb9dfdb7f1583eb950cf846f3000064dfb7df2766a7d65fc2e2bbcfa6e065ea0fbf8dd8f7911a534c08eb9919 SHA512 87249685beb8a5bbdf0b9761347ea1095ff67c7bbabf3f60f3b0eac49f607d138237dd21fe04680174666a12d135daa03261ca08bc348797ec2fc68ad6aad957
+DIST github.com-pkg-xattr-dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz 8305 BLAKE2B 0868ffd67db0b3a09137968163b71efdc792d8ae9966b1237c85d0e9c6fad9d145099c237c617ea8fd99aa50c903e8bf32ccd8c9caaa72006eb7387104bbe371 SHA512 ee8a75ba7b25c62007c5b3149a89f25fd92343c2220e1445374d9c75e9ff96387ed8b7443b8fd77019e07a727362aedc3149f6439e0132a27d78694debbea31d
+DIST github.com-posener-complete-3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz 20837 BLAKE2B fc698ecd8e975949bfd29132f3352918fd7dc6b7b4e12be1eb160206edf6212b5908909714bbdad94d83fe207bcc660a9d71a76ccbf393d79060d4f65064d9eb SHA512 f21716802458621c4b10637fd13191725311d21c9f676da1b811ae0d9eda48f4dd2fb977d30b596c73be2c11f9bab702e178af2fe70bbdfc45a2e3344b535711
+DIST github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz 56861 BLAKE2B a9573260bbe408c7726992937cebb254e5f488e7b879c84efdf2103bd97bc7a21ab7acf80d565226680b8022a5dc1d4c3a2e8d85a6b139d39bf249eef94f2ddc SHA512 5723d8bcc40b34727167cfe8c4fb7ffdb45837885638c392078755240b0ae46de6243ff83530bafe379e332e2a6797412552ae8d2d0abbb3a00cb61ec122d876
+DIST github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz 1735 BLAKE2B 129b813439dc2c15e6ed6b74cabacf8f4d59f3301b1530788dd2f0da6add921780993f72d5292d22ada44ad1dedfa95c29b2505f33463e9afb85d86ddc64dcd6 SHA512 745223f0370248a9233fa1940bcae461c3810353876441b5d0a81fef021ec426611628debde6a41b1973d1f7c3d2dff1600b5180ebff97b121027734c0bce8e2
 DIST mc-2019.01.10.00.38.22.tar.gz 1791858 BLAKE2B ae89c935634190e347be8c2f0a3dfff12872b4eca7aa17b79b5e05d7cb9be6fe39ff7b0ccbb6ddf5851ae3ee84a89eebf289d801340519e91470b3f5c60f7c37 SHA512 626e5adf5a3dcda0945e5fb37394097550f2976626da50e795b389d1d78545b1a2907c9b9fded5ce26823694e7e3981a69fa18ed00ae21d5c405c69c165ae1ce
 DIST mc-2019.01.24.01.40.23.tar.gz 1791330 BLAKE2B a3fb0cb2cc199f4fe21c7770d58a3278d6a89a90916bd604293a5845064e337d36a5ac2e565d785a440803b6deefd84f114115a8f06dfc38d234225daa66a55e SHA512 215f91a8f4f325ffb8714d92a8030c36ada5251df4b24cb1d9b82d7f8d6c0f1188dfc2fdc36b1dcf8d842a805ccba3965977908a01e39e7893e05b131eb3b9b9
 DIST mc-2019.01.30.19.57.22.tar.gz 1792065 BLAKE2B bb4a43549f5ff520c944a057fdecb80e892b03d9bdcce918613221357049e7ffcd77d51dce44b1253a3c912762749515d823cc8fe14a2dc8fb72060ff3943bd6 SHA512 14892985cdeba341c71bb93e41d468cae1f763fa7eb7489e0172a9bdb19e0f65efe41af0c2022e4c30c4018c6ee511bd992dc2b8906275c25896f084621ce96a
@@ -9,3 +36,4 @@ DIST mc-2019.03.06.18.41.35.tar.gz 3060998 BLAKE2B 8ce267ebeb132aae1ab2681d7fcae
 DIST mc-2019.03.09.00.30.31.tar.gz 3061079 BLAKE2B 528c3e8b20af8c77c256dbb25cee0c79691e6575f9739788927bd8b023fb2fe492fb1186f144f3abf1132b3b7375c649940b40c63f59dcbc7436cff9603fdd6d SHA512 28aa906be58afd85a5d5afd8458f5a200270d8bf4caad90484ee6335ce5033c910369a212f47272d6f7bcbb6aaa78fc35f3307da5e8bad3268ba737f8791f4c6
 DIST mc-2019.03.20.21.29.03.tar.gz 3068226 BLAKE2B 9659aa05931c28f054d639a8850692a77e81d75c1a86af9e7887fc492bdcb30c0e3582d42495a443945f1c89f691989d8e67d479cef4f1c1ebc82fde63b3f444 SHA512 ce4aad970b6f41bf06423a414ffc3396257c37654b9f7e10d6994e4adbacb0ba5b5fc94412e1d420429333e341ff2f76172d1a6ce978612f09f7ff37547d8d06
 DIST mc-2019.03.28.20.43.56.tar.gz 268089 BLAKE2B dda5b3186360ab917031423e1532a72da8005978b6c1e8f363bd97f1e1575399ee9d319c01aa2e7097e0b57723c8def849838ea99876b476d021bb8a787ca8dd SHA512 160054070e412c420b2c75e0d6f5b7b78dc20f07d695b46fb3141b3428c7a9391205810d9edd720b35b35e4901fcfe801277d4bc6ec7ff2a840ccc776f329bfd
+DIST mc-2019.04.03.17.59.57.tar.gz 268507 BLAKE2B 9a427dd206b06d2adc47ba430e708584250fdd43def2598b589b5b6d9fd1a761d5edde4370fd627b9eb337c24de22393dd1e2a732a74655f301fa89ca2eae6ff SHA512 ef234116ee49b0348e1fc28bb6265b1b45f835dfb90adb0c6008057fdf423e5ad68e8eb4aed83b780d3cbc06162a4e95866bc49275c8cceda4d42ccea094ac92
diff --git a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild b/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
index 927f40765b1c..d15b0813a634 100644
--- a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
+++ b/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
@@ -1,9 +1,38 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eapi7-ver golang-build golang-vcs-snapshot
+EGO_VENDOR=( "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "gopkg.in/h2non/filetype.v1 cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb github.com/h2non/filetype"
+	     "gopkg.in/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty"
+	     "github.com/pkg/xattr dd870b5cfebab49617ea0c1da6176474e8a52bf4"
+	     "golang.org/x/text 6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2 github.com/golang/text"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/hashicorp/go-version d40cf49b3a77bba84a7afdbd7f1dc295d114efb1"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+	     "golang.org/x/net b630fd6fe46bcfc98f989005d8b8ec1400e60a6e github.com/golang/net"
+	     "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/posener/complete 3ef9b31a6a0613ae832e7ecf208374027c3b2343"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1"
+	     "github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/minio-go 5d20267d970d9e514bbcb88b37b059bb5321ff60"
+	     "github.com/minio/minio 0250f7de678bbca5ad8bbfd50e2f65133feb06e2"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" )
+
+inherit golang-build golang-vcs-snapshot
 
 MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
 MY_PV=${MY_PV//./-}
@@ -14,7 +43,8 @@ EGO_PN="github.com/minio/mc"
 
 DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
 HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -24,11 +54,17 @@ RDEPEND="!!app-misc/mc"
 
 src_prepare() {
 	default
+
+	pushd src/${EGO_PN} || die
+	rm go.mod || die
+
 	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
 		-e "s/-s //"\
 		-e "/time/d"\
 		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
 
 }
 
@@ -36,6 +72,7 @@ src_compile() {
 	unset XDG_CACHE_HOME
 
 	pushd src/${EGO_PN} || die
+
 	MC_RELEASE="${MY_PV}"
 	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
 	popd || die
diff --git a/net-fs/mc/mc-2019.04.03.17.59.57.ebuild b/net-fs/mc/mc-2019.04.03.17.59.57.ebuild
new file mode 100644
index 000000000000..d15b0813a634
--- /dev/null
+++ b/net-fs/mc/mc-2019.04.03.17.59.57.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "gopkg.in/h2non/filetype.v1 cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb github.com/h2non/filetype"
+	     "gopkg.in/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty"
+	     "github.com/pkg/xattr dd870b5cfebab49617ea0c1da6176474e8a52bf4"
+	     "golang.org/x/text 6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2 github.com/golang/text"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/hashicorp/go-version d40cf49b3a77bba84a7afdbd7f1dc295d114efb1"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+	     "golang.org/x/net b630fd6fe46bcfc98f989005d8b8ec1400e60a6e github.com/golang/net"
+	     "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/posener/complete 3ef9b31a6a0613ae832e7ecf208374027c3b2343"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1"
+	     "github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/minio-go 5d20267d970d9e514bbcb88b37b059bb5321ff60"
+	     "github.com/minio/minio 0250f7de678bbca5ad8bbfd50e2f65133feb06e2"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" )
+
+inherit golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+
+	pushd src/${EGO_PN} || die
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+
+	MC_RELEASE="${MY_PV}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 9b95c941d09c..01865c43437c 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,3 +1,107 @@
+DIST github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz 14883858 BLAKE2B dcc2f5fc0878c8f47cf04af727825ee42e51eeb0e1eb8695f404a92aa572b83cec8684e9a6e59d20acf8a354cdd2eaf07d257907a852aea93d1331dadc3b2752 SHA512 0852cb1e2f9996e42a0206a0457fa6f95d35fc1e31041f37b413e2605adea40f4001bc0100a1cebf5c2af3baeb8c0621f1fed587fbd0e7a4abd54c985e03abe4
+DIST github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz 134957 BLAKE2B 758a94be9ebe23e8184aa5f80f3bd9dec41ef8cecf7e28d051bf5082fd5a77be477bb2391f0b7c730b38435ed5762a989502896b561c8d48463cf53bdf4fa7c7 SHA512 bb689f2a70680d0cd9c0f3337c45b93fba6329b03aba31a2737f4888d8460d5f1614b78e54bf9b277ec47d1daa368c637c8a0b6d61133ee07296d964d4943230
+DIST github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz 445833 BLAKE2B ebe3bf82d8c0839ef62be90223cc8052a5ecb700b1a8e8ee543d347589e1c26210e613d6fd9d6692c7b2f83728aba151734fe0ce849e68516fd291e78fdfcb09 SHA512 3405efb05ad33a04a78f7c5807c512bfef4d43103d912ff36746d6f64a12b02a5fb864d35555eecd1ff8e8cc91b961a47ee61c540ad42bccf30523ada9c89c89
+DIST github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz 187136 BLAKE2B d9bc4330dc2a1eac3db6aafb79837f7a2c6173b53c9d07947643d66791814db970adfb26654952378d137bfca6cd53b805545e4a8016ea917fdf2e60249e362b SHA512 1c1fde4982161b69897d88e825d1baa23a57157ffeec741c6ff55990140ef496f1e3394a09988fbb158ff2dbd058b66c3cea935d4ba64029cceed5f38cd37c65
+DIST github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz 53386 BLAKE2B 709989e25fbc217390d291911b7074bd9b03c379e43379eb83f9af1f22335310b4dd9516bb1785d1186c914d6aa6234478f9399dcee26b42ced7b49f3d59286a SHA512 fef6820aa36033bdabeb28e832a9828eeaddb1ba162defd9e35eea0fbe0882ffbdd1759439fc668474831dcaf4670099e239f8106a64d3a6df846c9837cff525
+DIST github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz 608124 BLAKE2B 15b99b58204dc9e74df1397993a59d5d2459e6f28b4782fb4614701ae39f3843df7ece1816495aabd156830599eeaf7f09ed29c731c2155a6a8e1898e32a0c84 SHA512 1da4cddb57506dd5ae33738a15a396b0b0c90f854ad16c2d942daf40182e7d1b375b27c1b9f994cacca33303d9943e0e86dec221313ad0a5905af719c96d7183
+DIST github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz 3162819 BLAKE2B 141a4fc18876d11e01d6ce47660b050e0c3654d9a02e1158370b156d8c2d4202437a9a5c36b279ae23fd33358004a05669d7b1a54ecfa322ddaf577111d1e443 SHA512 9c2fef780d85ae1a01138af16f4e87179254da416186d609bf74c326c49c586616d12b6eebd8e615ce9ba78e93602f860a2ff4c8d54eea0b9b7c55f111094d7c
+DIST github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz 42510 BLAKE2B 61cb8ac82c072f9929a2df6f77b7c10d08028e8d2886925dd0bc7973791ec1ab0cc0f0c2f78409f2ef58ac420778160df3dfbd2028a0ca9063975be84211d057 SHA512 eccd9319a479e77dfa8ac902236991bb418cea77d50350a4ba1142bfbea29dc25d7b0a8f262ee271281eb9ce630bf26d42f508e1f834c80a93fdc7dcbd96353a
+DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
+DIST github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz 31045 BLAKE2B 50fc3c30930a365e163052bddfb4af5c8b2cd217a11006962ae805d98778c813226711e10c4e2fdace40a8156422cfa7e5dbd3bad30fd7cd66095b5682df0447 SHA512 e1e21c04345b26497751d7fa6474ec4f916f4b2bf8710f43fcf2771cb9d3b7ecffe6e40957414399659e38ad95980bc830e3d53137d605a76770f5ea7c5f3142
+DIST github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz 220937 BLAKE2B ea099d34a0e869128227b8ad99977e8b7bae6386f32eeefefb7d36477d2d1e1b4e18c00e0e5db7d811adc04478a23aa745a8b89d59c95b863ab3f3aaee084935 SHA512 b2d85e2b86fd7940d8cf434f1140eae8c03cb2b77a2f46553e9d9cad9e2b913cb235a5d7da2852d75827d80b1f242a1a678490c13bfcdb6c7120338b3be43b3a
+DIST github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz 124003 BLAKE2B 9d3389514431c986d7f3f9e4386ce1a45f3ea7e5365ce7bbaf1ef3681fed5e393a3964c8bdb1d03477174a2d566ed36ec9b098b5eaaaf62c7a9fdb3f53d59717 SHA512 994143820296e09db5d8436309da35822f94c33f186e3c826c6c7a3905def8cc1d2bfdaaa36cf9ece517ad820699659727aada83d37a191d8936ee7076e4c618
+DIST github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz 11788 BLAKE2B c7726ecd41c5d8909e157a38db429327d09873b4a4661cb7607893067c362487339b33eb24f122df7ea98e81bd4556884b831014a6948a108b74c71f521f1296 SHA512 47f0985138603631d59915b01fc99b4d4fc44ea964e1ad50b472cabec0fdf57f6235dc05ad32629bc086bc3f1fe25c2a3a31be064f91d398fdf37799fe4aa8db
+DIST github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz 5777191 BLAKE2B 82c0c3346cd9713ae5376686dc1b528c9ab7d07145b669bd76b26f1d7a8a34300bb45a8aad382c4bd83cab8e6408e7078c7ae6bcb2ee9aed2d885e5de9cc485e SHA512 d182d4de26fa68176e480a532e1ec4083503486a4713fd1df7ea0a1162b6b105ad55e3a3225cef984d05982afbc03247198abd4833f36a3fb42a9b6948587147
+DIST github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz 3528884 BLAKE2B 5e5d799ed7cc2d242eee12f06f1a7dcc8dd8501b19d4fa61b53191c68693a9c7aa1ba8a61a1353a2fca9c1d783ab5400fd1e3a0833b0f1b0f3e5b8a8e67781a5 SHA512 b702701ba789927dbad2955fbe1d75248b6a6e4c0c127fa22f6495821aad68eab8c7377bce2ab52a20df7ab52c8de299994785434c13583638d23cc930b98f9a
+DIST github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz 42224 BLAKE2B d731756ad71937d6616f45eb172cd5122524b12ef14d653fdc9248b6da1aa103604f6493fc93b186bf0d6b8c301c9eaccf9e8abb54a001427d9edc0fa2185c35 SHA512 9ecd1d77675ba7080945f68053e37450d003d8307c9ab507c7d64566f88a3d8b61fb9c9486ca3ee0f23c0d4e1a2e93391d1fac0a0882f351f21a118e221925a4
+DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732
+DIST github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz 2914 BLAKE2B f1ede351b08a92a58a7daf97060c8b71ba6f36bf8017b1ee8dfa4ac505beea2bb254640f25b78050d2d896c5cea2eef2dd7a96eb030ef7a06186cf9c20390198 SHA512 b08b9d929b8e7357581a2748edde9817aaac3ebe713e407b800b318e8c75d7f97d487c7563cd0a82a95f551b42f093acfe2d458658c6d0c38e864635bac9c448
+DIST github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz 17263 BLAKE2B 6915367735a060d873947d805b49b1a6900080019cd5c21183c11850a0fb5292ea6c93576d7bbc8939e6b0f1e31501c44b38e5c97c09fb5685053b50142de092 SHA512 713ed1188affab7954efd4a6656d0bc82368b2c71e5604afbdcf9ea1ead401b821c443d5cd1c634964139d76fcf69d9a4b0efec4079f0b2335b1c15ca042d0b2
+DIST github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz 10215 BLAKE2B 3300b6f0d28da44b8f96b5b129f9faa46f4015096ac6d66842c816a0c0db98ec7b393c703153f577b5a5c249e20d019821f9180fa887780547afe343cb288c2e SHA512 9d801e0252710ae6368c1ccad3997eb4d61bd4f4d937bc683bbce2554474cc317b297ae0a2a2f95260644fddad72b91b8aa8802c9e10876e53e6e3f4f2a9c57c
+DIST github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz 7841 BLAKE2B 033e8657f43bfc921558ecb0caa1f68c3c00d04912146437b19d1ed1de5fe57d128fdc85d14280e74dda3c642183b9eb1bb459bd68f9954e874fa5df47552f03 SHA512 17a34fa71d2ab18db970ce945489aa73bb64580423ae1e048cf7635a6f91075d2b7714c835b29999e2639ab68acd6f308ac4473cb3e00006d50f7002954e3985
+DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162
+DIST github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz 71809 BLAKE2B 7e53baa1e7a5ef73225ce0e85f7668a642065c12b41de4f9a9a3aca3c09c8dc843c18386334f3c01c146c8ad0c7a4cabc08baa72f422236fba588d1d12bc7f12 SHA512 17668f10839e946cb6f57569a62ab846af36e1fc341155465fdf15d517a981772e3a39d85cd37a3f5ebcd09ce9ac7b4c37c2b5e375add655cd7036b46a2ed82c
+DIST github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz 3810 BLAKE2B d013b29bcce86a2ad0f41fb95292c571bd79f50061900b20d62564fa5ed295bf523f5bdac75e7eac8ce6a546b9f965a06ce3b4921591ba1f2a7671045a93df2a SHA512 1972312843339e0cebd59f0b1886ce79a755b5594b74ae20b3cbe127d6c379eb2df0391d73e495f83ec7ac007fd1be9a9d5d51ccef693eb883b5cfc06279b0ee
+DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d
+DIST github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz 14445 BLAKE2B 8094dd5813096fae5770a47d2f9184ae0322731d2eec49ab3f044bb4e5c4dd1691a4b20a3fb17d8cc8fe69fe7befd0f122ec28ac6005f8e776eea718dcdcac6a SHA512 7a349c5caf684915d3e1c0b9868802683e46f97868120aa3b48037a3c75b9155f5694f3a153a28e017d6d8ffb7dcfec8568691f4a66151ec51866e231897ee88
+DIST github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz 35081 BLAKE2B 7adf1e84f4fb23632f9bbeaa53e3d5b6a12244999cc5b744f12439459be4921a271d85e3e2dfbec08fa12b1dec27016e78805c600d7d4798bb84aaef5756e49b SHA512 b2758ad40b532e30581f41b2cf609042388acfb037848858c394c0edf444181942061fceba6be76aa7913e62954cc14552ace7b4634d731a6bbe473275655aee
+DIST github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz 83591 BLAKE2B 906f8a152c184e8173c9f9361d48a4d8cdfc5f8688d749ba43a7ef14e94496689a0e5bb99bd22a62904ca5a8491434e417732bb2211314708efa4ff4b278eda9 SHA512 a4e131ed4f0aa3c4da424d53b290258d696836c5870ae4ad868ccd347118c811855cf0a878e18ecde190327d7f7178a920065d722b70226f6afc326f5d510dc1
+DIST github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz 70766 BLAKE2B 3ea4412e259626b25145feacbe68b529d2bcf353bd098899c3a906d01f75bac5f93ec20967f7261feb388356d7b12fa945ec73822e21e029e38ce7c0b27855e7 SHA512 dec54681845fb5cdb159d44bf91cb703bb38a6af1821566d7b11a0668ee50247f542e3b7bfc21571198f9bda8ff31ce32cf67f98a8c906dee7ea9194643699f9
+DIST github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz 2040041 BLAKE2B ea3604ac69e703728d52a958ea016ff6bd61b4340da273db8865e264bbf524eacdc3bf82fe329f7894de1b4616b3ae131d1cec821c6138a338bdf9b394eb5d95 SHA512 6541a92724d1349d100ef6905d42dc9ce322a2c1d4080a6a1128db5d8759b4200a4247889853302bf683b4c3ff3af4c798a585cba33c6536d5f29f13e55cc81f
+DIST github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz 1656765 BLAKE2B ce9b5ba9772c436a9134894bd9e93de6ad27ad0679b406c67c81dfa6d420e690c8caaa88f14c7015cde1fd642e581c7d9918c73d68f2bb1580286dcabd275792 SHA512 274a47b08129912488639c5cfcf59bc17ac0d863afc1d25b80596801022b5317f780aaf1ae8cbee6b6ef42979c22c9e1514a4aff2f62d3d1e6cace59016e0286
+DIST github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz 977441 BLAKE2B c4e3fada087341595861671b8c0d1b23a53296852d335fb4acb7f6cf6c72a4fcaa56027bedf3582a48c26aac3102ab5f146ab983c42642fe6b72a0d344ad1be7 SHA512 af5b53755d68d85313fa0c1438e4df98b077e4f4c1035b7772932593ee9ed9750108aa93be2453df723f7f008053d9f892ce565e8a9c65883f6c519c4a6cb8fe
+DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
+DIST github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz 312302 BLAKE2B c36832d29979178442712e9e90d9db2f65d7664170a7aa9d387932f1238921904c3702d8f875a8e4213d58bc99eb2ce1a301bbe41b1635c705aa7c2d592302d0 SHA512 2d85f8767c44848e19f4883d7dbbe3d1ec36935a9c9ea7de45660b4dd0cf6b212ff034cced81d8d98e15ca87c26229c15fc262626d621d920739296d272ae1b7
+DIST github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz 62641 BLAKE2B 985efd86569c3c01cc108afa841cc147b090eb6448932a39831772ec775403dde9d7763570ae88e1a7759738680fec50a603264d1f70bd681067b84265086752 SHA512 8b8c5f5902815b8ae620b33a94dde3df2ae6688a6fcfa6615658bc33b5a08c85d83bb1af5896a87a8840d62b31ca8143e4b2843d6dae070f89c23f8f92b81d21
+DIST github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz 16285 BLAKE2B e42c9d05fb223eb7f3caaef4ceb0e476a4467f8a88553982b2115b3c2581025ceb3ba4b8a3783bc311c307e3d6b2bc6f54989ad447662400d9488c915dd3c44d SHA512 8f006b9178c70fbf66744aa91d964c7c349b513f013753df804d6fcf7b727e35871cbd606c551ea310545ac36aadb6febe3af59091ca38425ff703c02e555e7f
+DIST github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz 1262962 BLAKE2B 082ce1d2924efe2090c735b5338b4afb24cee1109d445ad12241fba95413fdbb5a1b5ed3425d4822a610b38cdf2fad7d3fa5af2d306ab396746fa38d1d11195a SHA512 04cda320e2c5c5dad102657725d3c94289937194836c28c4633b150fcb691123b12f8eeeb8538f76e747c5626ccb9dc12667fce362b96448195a9cc332045db2
+DIST github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz 6593234 BLAKE2B 356acbe3ae6e16fe02bfcc83aa12bbf9e7b72b17f7120c511a7ca31b8764ec0fe52275d489bd288035b963e179952077d5702651f9d34e1e2ce5f7c1ebc8fd9a SHA512 9c369041f7f6655940c71debd7de195c17bb302438a44e3f2c7db57505634b9a9a9beae3ed239bda994ba2da062565d885a36954f371525a59de4f7a45ba6480
+DIST github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
+DIST github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz 42978 BLAKE2B d07f49e9c9d5965b30c84383042ce3581a7aef40a410b0cd1febacf09cf3598654e5f651a3defdd5e7d1bc007fb04b703fd280aedb83ee2f5c0906ce78d811a8 SHA512 86521a448fd20e5bcd29ef1a4f2748e34db188100a1733f1b2425e42e6a4962e449af417279664017f95891b29670961514e2fe4c0010486c52fd95888df4e3a
+DIST github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz 4779898 BLAKE2B 733632bcce17c341498df4813e7bf2fc5f25c9a82fbfd6f3637ba05ee6c6dc9e231226d826fc34a85b035713d38ce0c70534e67150324ee6ca7725dbcf66d73c SHA512 ed5fed4410f579954330ffb3347aba2e072bab5bb95166bfbc606170feb4f9be48ce74b428ece527df405399f1c0c2e65cf5e9e23e8911fbb163da5a2636fcf7
+DIST github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz 14330 BLAKE2B 06c7116c76f32399449bc2729ea98b66fa662cc4cf51b8cec6a9254bba9cc240eb5369168d1393818fb8dc19f966ca0d431462b68d4b57a04f13328221f0004e SHA512 606aa0c72c0e6fcca594332d678a8120ef3cfc506a734a973424dc429ca273a85486deca4c642a7892af698f8a6df70fdb26663af8abe8a7604874fb735dd188
+DIST github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz 11460249 BLAKE2B a4aa80a912eda428e4e106b819806e0edc9e78b3a455303aeb36582a9f59b6c7098837da536f76331a827813b4c36b9e3c1155a8b4900d893a749a11361aaacd SHA512 3cb1a5ef7258753f2ddfc7bf48df3ebd1e61927998a7c15a4ea8e74f5b7c701435a7f40b697dc9c99ef6a09aa2386e4aa93128b6d67423b5adbb410b76d9cace
+DIST github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz 1924238 BLAKE2B b85dca126c17864a38a3745e03b9c95e5ed4491351d97fcad755830ac1618237abdf5a4ac5f93382fb00e30aa60d18c05e796b45f48834463e1c278a0db67c64 SHA512 ada3360422033b8a7143c047e7c01c97ca305567b1658238d04291ed88815cae352040b4db68f862961239b2da48f577041d4b4b344fe3ac210d8329c8dfe0ca
+DIST github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz 1933640 BLAKE2B 4089b43ce5841d64f0e3c3886940f1f3bad1293240eb5b462b34e14a577a48117154e10e4d6c5401c942acecc3d1eb236fbcdbf72c9de39b888d8e5f26182cab SHA512 82613cb7af26002c879d3fa084781552b6aa1b3487d0dcda0e111e8ea8a9c9407906b0b552cd0074714fddee85c9acd1fc4ed353125209e99df58670ac547621
+DIST github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz 18390 BLAKE2B 40a9f09aa256ea8ce2c3080daf84667813e441b7bc1ee80dbef9589b43499d7bf4c3a6230e3771bf6fef790b9ec19aca512624ac4766eec5db1940f2fa7cb794 SHA512 04675c1f434b3631bc67bcc8899f36c59dc17bab8f186c937d2f7487f3e7885de6fa1c0da922add2179b04af9d5d1a5f13ce5fb4f3d767692089aaea06e6cc9f
+DIST github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz 40828 BLAKE2B f919f2c7abbf80aba5c716b5a7cfb9e3521b4ade2c080c7c403e89a85ac955f3d9ac03ee60f9d569534446c032f3a3bffcc40e18f6dacb7d9dc2a60b29ce3ded SHA512 d472ae5092987b539529fe8e97bf59176948f24a32973d0e457790fa0ef630b118bc462ccaff8c9404462015aaa04acb2c174ef9364d6bd9332d2e02a5bd7589
+DIST github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz 27334 BLAKE2B e037414ff5fa9ab181d0d743cd2176db71be9005a8461cfc769360e94cb2e45a03d232dd3b6f932052a7db0a8cb28b40ec6fb427d666db53a5e9e42ab44991de SHA512 a7a6bbb4520af8f31f57b8685bbcdc7e57db0d2f2bb48397ba33ca3ed238d1323d8b96d73b04447e19fb32c966454f8922dde7ed3dcdd868b07cca41068b7f1e
+DIST github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz 295171 BLAKE2B 9b3dcf0b64548c62421d6498e33388d24f168550169f598fda3861676bd79375cb6eb684570401f5330e9a69e3963f982b219528a3abfd0bc1b2952dfca7b897 SHA512 3f96959e273bf70acf2b3b3d32afc051eb01c5cf6e25e89fc69250fe725802205ca88daa5977a77e8f87ab29bf682dc9689e31a7251024e7b162da91798b1d84
+DIST github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz 600679 BLAKE2B a959574b779c031406031581c9bb8767a948a510d3e6e5242982ca6fb19eda047277f8620300970690d090c3391eef18d6a07c8f67889a202fa7e3de2c36f4d7 SHA512 2c715f1610fb39c40ddc93cfeb874232ac74cfc649305a43de7ab200ca7a72e9e2725c91a3acada6a4ee511e442bcb1b95ae6e29462e8d158fbbb08cb61ca80c
+DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
+DIST github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz 25953593 BLAKE2B b644e45e177605ea922261700eaecbe6089f548fc2a2d680a90cb708d9b5cc80c9b5242aeedea38dde15eac6db640444b772e64f1e318261e08596ac7bc21a4f SHA512 a0e9d8c6d48aee34dbff84d159569561bb5e299e4b084080fdb7ad51cc8b9182d7b2f94d8bff8b6e76ee56fad708959e621fcf7df9645f6cc7521282f8e85d5b
+DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
+DIST github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz 27126 BLAKE2B 0972b3af87057486bbb85bf79ed5894eb6531ee9966b8048f0f35baa750a868a697c2103d0f26e5040d96a24ce5a9c4ee0f6ed27e262f4618e2d60165cbdba13 SHA512 6343652b5c8e5056240cc0eafae7c37772a24fd791b8cea44036af502257e403ec374bf224437391da3b596cfe6d6aa1f3889d24e5b62d42e3ddc2fbe66d696e
+DIST github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz 3443307 BLAKE2B 926690823f0288f1d2566c6eb61320b53fa0182d10848752cd3c216cb71e7bde8694f7cd77456f5c0727367e81a14b95546edfe2cd204f55adbdf41fe5f3c0c5 SHA512 b4a8e5a8ce57dc80b518523f677baf7b5f24a2f6906fd49478c87b917cb904c60e5e89d8cec5e382959c739ed3a3647821ef928d93265920d0b44f47de66ce02
+DIST github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz 278906 BLAKE2B 3a9e67372a01ff8aa51a4de50a40f7ed9a6ebfce22bd11849771c306a911909f0900902cf9cb3e4117576fed221af5f578ee9a69100cab0c6083566866676a7b SHA512 d5b6184709e4f5fe25e81b172ed40ee98f1cb87d38763235b6df399c71ebc4207e12c6c465c1051471d1aa3587adb15140017d9866e9d26e5f16822cb6a903ab
+DIST github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz 121645 BLAKE2B 8414a1cd97c510a50a12bfa724da4f79d27d00f671da38047bb11718414a117197f02ad71b70dc50e7fc37401425ba318cf06afe80dc26eb1616e988670a644c SHA512 3cddaa134b65646e922e76ebd25791a9006fb90e5e6b0aaba3f94e41a2f7874aec9ea6df5f218d091a8ef8508ca4e99ea4bdf0102a646f932f33a08327383c83
+DIST github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz 159438 BLAKE2B c249fe3e40c6e93dbc45673e059969c399c8f84247dc2cd7f6eeea9ab0fc6a12c522aff9353f030b913f9f1483a0e17bd4cbf214a7fb8608fd28b9c491624784 SHA512 11c12861c1c4a065b3345a19f8e6f5f5e605fc8af19e1d16dc2288ebe066f972816c021c3a30a96d0b2216f4fb337a6ca978d98cb8ae67e556d4fc0e65e161b5
+DIST github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz 91534 BLAKE2B bde0d514ed2d699b5032c9b8126c5b5183dc3b7ff47436519579428bd98126f60fab92f58d410cb5b6114d5edb84a689e2b33532cc584b0fbd8d5e8a96343599 SHA512 576983fc6cc55c69a76254d392a1cd4a36e922d23274bb9abbef0666884b30a8c1e67915acc8e0175c82eb5392900891597176929b332775c80f1ab47d6828c3
+DIST github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz 75507 BLAKE2B 8ba7b2b4eb3ea47bc151fe7c573719290dae1230c5ff187f1301850c6a711c53f0be23c2c3c4d310d6832676ad6a8035b867bab4ddf9bd934342870502d25967 SHA512 092f98935e1c31f6f041d1a63f635c414f0d0db6a5485b61a57284e45705848e04bf94776c1deddf3687195df487de2117a150123894c9058978d43cfbae4e4a
+DIST github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz 6590 BLAKE2B 9beaee9b00ff8f847370e044ce98afc4d369b6d1a6d4bd9966fd98bc631bcaf12faa93181266367fc3c4610a1c76dca83ef762189e769d04769eccd4101f7aaa SHA512 64b180cc4ea4bd57310b6519248491e1c6873b28e7e29958b217091fddcbaf323b940c840414d6bcbc4babec32dcb41a986b7a64c31add4da8655c8e8c7e99bc
+DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d
+DIST github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz 3567 BLAKE2B c5c1b883ea583a24aaf7e207461ea54bb56e536695b9a7de1fc7e8376fbbdacd1600d0b59fbc1b96d765493f2db9a8a11fd1d069da5c108cbe89470c0e9190a9 SHA512 aa01330c30691e984586278ba64b9990bfb811c3d9fd66a98cd593e46f3a8e39675fc8ed0892dd03a4f3850e9f03fd9f4b75b2506737c4cc67850eaa1bbd2c93
+DIST github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz 19845 BLAKE2B 5512128da165241ee85c1761d86d8a780f5bb57474c66c49ff796a1a7bd3b59ce1dfc2dae04bf8b032f1939fbceacc60355a0eb9ae1fa4619418ed7b934153c7 SHA512 456bb5314164373c8589109f8333e29c397c44e4d9882b544e86b2870a44d75ba397dfb58287908d305c6928b098097decec753701eba5c17192479c900366ac
+DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
+DIST github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz 3889172 BLAKE2B 55e399833ba395e1a7acd85c59e8d34ad30c6b2742deb600d5eb7ff91203f447d9318362b6a52a0a81b41b8a734493acc393013ec5d510f5656ad3fa21121fb2 SHA512 d13d3d9c939240f6015b10f6d64d2904271c863c7f375272d070b789a6ff5dbf8d7587ee0203db8552a7e0f6e3f46911aa7457328aa831a6bfa7d2edec468b6c
+DIST github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz 46678 BLAKE2B a36914128c00b2dc6a331847ea7aefaf7bd3e832f4626f0499387ca1ade8b54670b29ac587a0b1e2db4d5d50ac44c9a93f1a72b3beceb3c08b00985992aeaabe SHA512 1039138e7b1518dddba43eee4e6454e14be04c1dbcf0339281127bfddd933430e2b92c2c60e41ee7fb1f42d2062aee1c4c690af2f334221d8addd5091c336b74
+DIST github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz 57326 BLAKE2B 9e82904f852ff05d3809770762f1137116e6e4a421a5b4a9ba483f48b24287a4dfaeaca90bbe738a694b44f010d86c6fe33a2383e9c60bac728b5619071f1bf4 SHA512 e2aeb507392d34fb2908c3426de6b6b5b662ac88534d46a392a463f1447fc9c21945064482c22b02cc2ecc2c889a30e38c37d37b50117a05959b258f60c6de54
+DIST github.com-minio-dsync-fb604afd87b2a095432c17af2dda742960ef111e.tar.gz 35380 BLAKE2B e622d00ea6d59fc8acf3d00e145626c9112a6ad46aca61f0e0cb405f59756021587385a79c03d010991fcbaa7ccf6a32702d018637a94a908fbc9fb6351cdaf8 SHA512 d8657ccc0e2a91fcf9111a427c19cbf0e24efcd7065e8a76165462d1486de26bb961bd7799f1a1a53bfa4b3978cd430693fea564e7cc9abb5b948936e4145832
+DIST github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz 17866 BLAKE2B 964c9194816814433dad2214c66b3a2cb14a95b97009ceecc4a05d46b73206fee8eb0b98c128bfa202cb1f024f2ba59d761ffb55c197675bf56cd2f6bca1cf30 SHA512 0e9b9fe87e9d46b356d92c7d8c8c7d534e1e0dc8867b78ae3ff09e3b8884f6491c087a6cfdda3a3b639d05ceb28d7c5d296c1376ed7c2a17901f27b482154000
+DIST github.com-minio-lsync-a4e43e3d0887e88d151bb3f90f678178b4ec0c5f.tar.gz 8185 BLAKE2B 4f2cd7f8a1663e2605629283a2163dcf01daba123052e22d65d6a756bae404c57aaf4b4de197bc953ff2b43cfa3d1c429e3a2e55da78d29feb9644d1b0f3ad17 SHA512 ad55fe2904e40449ec4da4556d6eccf75a0d23d0950e1e7cba29b4cd4b7ca641662d38bf30566d256422ee4f0783d4461f4be82b91d05c85721b98d3511d0cea
+DIST github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz 268431 BLAKE2B bf518e050b7fe442cf59c4a23c997c5e2c13223ca0dc11eb6db13ba4d6a301f3f86d47074f3bd9f4697375291dda7e9e1d74a2f6b1db13c93c2b27998a9219ba SHA512 7031f7978a8a8aaddb31fb140b49ec29ad82c64970115555a633e97038a989c3db00bc45a18428a400f67457375995e9f1b6ec76f48e93621b9e94ef0af6b9f5
+DIST github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz 190652 BLAKE2B edeeb2327e0428fc82f1c31b9826285303ae4bfc1c6f20e2fd94a3760b816c538b6da42c3f8a93d366c11d068b8fd23b2ae913c29ab4f9413641026e17b58fac SHA512 099b05c20d597eb506d68b2c8c256ed0085d058e43bf089db0b90d1cbaf0bc1f1ead1ee8b7a50e3810199d6adaed11a0bd488ac6693a7d0db4f9ae7dea198246
+DIST github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz 64834 BLAKE2B 75c349b550487891e252ed98ef577e235bddf9a9a7e82bc85049ba29019c904686669d121cef56450a55f60eefe895da57e4f4e8ca4aab0bc6d0ceb7fef9f64d SHA512 1df1aec6eb7c1aa21f9fde7ff08160d3fa118518644ee9f669092a7226bdf54dddf9bcaf3c77a4cb5ed30239b31bf524f76d3e60713e60614505bf1c6fa4af7c
+DIST github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz 64938 BLAKE2B 0e36ec0383b136b0471bfc71dfb5062c7cd1b1d0708f2f5a58ece02a45b819bcd3691d85f35c66ed8a90cb4d362b86182a185916fc29e0c16f39c602fb9894eb SHA512 36330af07ffec389c92f0769bf01188de7156f2d73eeedc03280a1b4000f3a0fed156737c3b1e6554579a7570f156dcd16f52a895b661da51628496221b9b593
+DIST github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz 53790 BLAKE2B ab22baa995c78639aa8cf1d38b675dfb18c64534f2b48815187750ef4182d761fdedc7e12308a15fcbf27af98a1054f3a94f3891968d5766205bdf16fa71ee30 SHA512 7a154aba1ace8687ddb05719de1da2c60e451bb0a00a242560e2abb8c0ecc838771bf966cc8328be0a575e3a5b8b7366348aa14f9548d9b741dc7876077417ab
+DIST github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz 3362 BLAKE2B 6b6381ba8b7bfa05b0ca04b8492d9f66d0a5c76c41db3476fd0f1fac01ff38f50465953b64f48b00859e28a5725feb056f3c1bfe1234376d00e2e37fd2d71a73 SHA512 049d31e1ebe03ad0f7312819414aefac9958cce3ef14704af32104af6140f31a62a23579a12bed80e8514147ec4a93bec8eaf0f8cba8cceaeecd05d577273b3a
+DIST github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2
+DIST github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz 47499 BLAKE2B 1b6d9979ff523cbeed728b3ad28c1a72f6ea5907c41111d4ff42addd7e1cc537b3362b0a4fd2a7c3509de0265857c2f3ed10a8f9187812ee20d40ee20cf6ce4e SHA512 3f9b9cad5b36571ef593adecb45d7fd6a83673e35a5e3d9e7b5e5ad67111e6403b547ec48bbfb3e0916440d12121e647cb9c758e2f16f094d07fd7df8b2d0c16
+DIST github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2
+DIST github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz 17271 BLAKE2B 28f276071c5b1921645522302c280ac13253be83e96818071762bc3401a8c8191912a80c6d85e4401fd14b26748eba80a913b3192d3ff8beb84ce7f9f5d2b856 SHA512 ba1dafde47a8a14278c985ef56e3e9c19a8d610135e3847e9c6a47477178db64c0ac41f7240a2afc95e7cd20a51cd08450cdddde8577f5b4abb891ef9db57d97
+DIST github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz 7533 BLAKE2B 8adf4385c7d2bbbaa22d7dd71436bcd17150e4c9db4579aef94b83cfa71ff053f3838b1de286ac61c1a6d1f8a9ac4cd7900e9032a53bf7b14e6b5327b4cedf9e SHA512 652c2f06153cf8c3e4ed5fa2338ddef3165f82cd21f27293327551aac2d03010fe736d0c2ec0ec8b3106c78b79f809e9a81cb1912eb01879bac53f87de70d028
+DIST github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz 44818 BLAKE2B ab4e74b319f50708ecf95365873bf3b49a940716af731acf5467b845b5a9c92e9ccc8312f3ae54c3f63738101582448ad4d9293a2e9a1174f06376b1a3f7350a SHA512 93aa5fae0b51e8149728523df0393a12f8387b0c08417acaf3224b3ce61265f96bdfc5296a4add19f7eda5e5a2e4896830f959e1b30c299eacfc24dafa80d501
+DIST github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz 314237 BLAKE2B 526186fd4a593708caf9b0ccf4cfb0efab6e883074238f6993d1f844c5de747ad3713fb95a6bd98810dafb7021a163207a24754e46ddaa52854ecbe7f9cb9451 SHA512 2c3c191189f6ebb28f4042aac921936bbfc08c2194c22986a6689aa26515b9b7eda51dfddab241c252bc8cc459119c63330b1ea827bc83886b6d388d3149db11
+DIST github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz 7465869 BLAKE2B e5a15dae50a9499efe45303f69b9b343024b24b6fc1808324ce436b4b2b6a1960bc789204e30886b270bfbc990133ae8f455c00d6db628b1994beeb360ae766e SHA512 218766ef534f5409f93ef6a221493b295a0b89aafb5bf1ae072c68363a0d4b42ef32dca689e1ee143b769309795860d5de56dbb280edade4d9a8122662f11527
+DIST github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz 11015 BLAKE2B 6ac1c39b0dd047a40fbaced603295ebd957af6e91620e8a3aef64e922f733cf5573394cb8e1966e660e7cc1acdd485ced1cab473d46ef7578167495cd50db601 SHA512 73eaab1397cb5a8a0735edda27994b069f97486023ba95d8ee0d620d16c0b955f608365ad0cd46ec8ed59b4389c0b4320075ea0e28c8d63f7a62dcdf2251fc93
+DIST github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz 5838 BLAKE2B dd40dd8ee0cd6b9c7f4d48a9cd4dfb351fb229bbb9dfdb7f1583eb950cf846f3000064dfb7df2766a7d65fc2e2bbcfa6e065ea0fbf8dd8f7911a534c08eb9919 SHA512 87249685beb8a5bbdf0b9761347ea1095ff67c7bbabf3f60f3b0eac49f607d138237dd21fe04680174666a12d135daa03261ca08bc348797ec2fc68ad6aad957
+DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
+DIST github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz 57542 BLAKE2B 16f73bf9a1dfde0dd3152e11ab4d3a49271209b02541951471664a1226c9211f1b77ef4a32faf3e184888b080d0c76e3d02d03e21d688399d7e3c14629df738f SHA512 bee4b4ffdb56633ac763dd624d03db5b0dae433e2a2d1e4ff925e34444d62cbdb879d68574c7f8133f11d718cce3bdc1d686508acfb470e7dea0109c98266b1d
+DIST github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz 97633 BLAKE2B e0457947dad793ab73480d65e93d06f50a01577b0cf00fbf0f56ade4b6c7a791c391ea4609ea0ad937242b7f07eeb3af8c1b0322158961d355927f940463cc77 SHA512 fdeb351e26dd89526485764f667253edf0e64b3c1a1e16150171e43d86080d1045bab0c057fe74360331d965310f1fe265463011a8bd89b8ffd27bd07e041b2c
+DIST github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz 70986 BLAKE2B 8c0580381440197a9e6a50ac686ea7d9b134790786ce2175fb2b98288c9ae194585cae7650fee6a5d262439b01648d1aee494d2eb6183ff9edd33e6fb40e3880 SHA512 4d7e2576eba78643a806e25021e5d440a8a606e44a153428d99387a6dd8d3f745492818e0b46bc0ecf5fe834dbc781c94720f2d46af5a15a6a1d4ce5807077d6
+DIST github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz 36745 BLAKE2B f5313bdf8173c5ee0f0eb8a63b68d5a9c66c18b3a2164428200a599f12afd67af7ad1148766fdcc7d17601121f357d20afc707f57dab1f5d38a8c96e146d3521 SHA512 956bb23138464aa09045fc4927a5eb6d0ab53f93e89b8ffbbafde6ff0aff1a2ff80b302a98560d9b86ab7f6a845b1dc7bcdbc43ea4cd0e5ed4d712233af32eb9
+DIST github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz 56861 BLAKE2B a9573260bbe408c7726992937cebb254e5f488e7b879c84efdf2103bd97bc7a21ab7acf80d565226680b8022a5dc1d4c3a2e8d85a6b139d39bf249eef94f2ddc SHA512 5723d8bcc40b34727167cfe8c4fb7ffdb45837885638c392078755240b0ae46de6243ff83530bafe379e332e2a6797412552ae8d2d0abbb3a00cb61ec122d876
+DIST github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz 12086 BLAKE2B 284fb8aa183977f2408e88daf44596d2660e66d8ab353d5154f4e7aa495a8da51825d257627491658a9112c39565cc88df56ab5309f7f3f1fecde840c0842e08 SHA512 3e6c12c17a0fc717b169ac09fb51d5ac2f60ceb2f1f5af9041f15d56918c4f9855ddadcc178b11610483492d939656295ac18ea9367cffc05a49ad81f56a15f1
+DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
+DIST github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz 1735 BLAKE2B 129b813439dc2c15e6ed6b74cabacf8f4d59f3301b1530788dd2f0da6add921780993f72d5292d22ada44ad1dedfa95c29b2505f33463e9afb85d86ddc64dcd6 SHA512 745223f0370248a9233fa1940bcae461c3810353876441b5d0a81fef021ec426611628debde6a41b1973d1f7c3d2dff1600b5180ebff97b121027734c0bce8e2
+DIST github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz 2195796 BLAKE2B 141442d016912c250e1e8521502be6841fe62a1570c2f339add6ee47c81f4875381afeada6fd27e564a133853145d32ec024600b7f9c2764aef60a1a94b36c03 SHA512 25c68e3ea88deb873d82fc6b168795a737a27646d897256455bae59d4649a571faf0aa1053bf653136902bc461b66a358dc5afee0047b778c2a2b9375491a87b
+DIST github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz 88119 BLAKE2B 754a2827ed68bb3292cb88600e1e1a0b9b8cbef5cba4429a7ebcc9f56df9d26ae5e66f5b0e7b23a882a8837d9aaa79989db7f47044b114608bb9869ce3933e3b SHA512 b45a178d9fb82094ec478a95b83c835363faa44fda4b75d606b47e900c321c86160892955ac60cf085f8c3b865668d737287eb220c066ca85ee7f9744bc416ba
+DIST github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz 43193 BLAKE2B d8b3e59a7d17998ab50bb03c5c70a3fa06d8c52b8cc87c33a8397e1a7e2d45ec1242fda6b6060f82389c53350b1f7deb2ae01aab7328033e14fd5244aa91de89 SHA512 02dc20ad73431c688b4dec492e4015dd94a0d2dad7b16fe9c05ac537da47cf9f74713d1802bb4095721b20e8d7cfc669b1ab720993c776bc4513338e8ea074b5
+DIST github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz 4367 BLAKE2B f3f818845cf29b9800d370ed6dab67123fc1a45e52fa3aee4f80ddc728559da61864f9e72c6f402b9dc6b0e6d67370f88bcca26ec7a481f8ed1d43706f880ec8 SHA512 357e4a22c8b796169e901e73b5e783fde6b7ec2f2954cc2da6cd75f4c3bef46ff58d57eb03ea07267e6951e313ca54246448ffb64398889c9e72e56d78097767
+DIST github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz 8823 BLAKE2B 6470a0221efb65e13d22e7cb8c5c5e43065d2980511b3972e22dfedb77b374879e4be055cae64fe9e95ca7dd0fc89c99159dd49651d43db8466f0b18e8128f4e SHA512 3a3820a4029a310e69d997dcd2a378fae2e8c0c0f76c9e2eef87bf43754832999ab4dc4c506a75e3b788ff855842b62fde8b1782ea7259a6c640a0de99a3921f
+DIST github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz 26764 BLAKE2B 1756704c32c465c7368f7947ec0c7f257dcc007a0a4eaa3b18c3a3dbcebc5bd952d128dd92010bb04a4ad55a0a1e2e3e3c6524bd18ef082671d39fb9225eb0b6 SHA512 314d63ad24d9b5c4133f8a2f603a19e09f73958a61c8b10b758f760825a411fd478ab47a1fa0e95c1c5156e7b2aa0ad611ba2ca91bf0b10f6bf2b9608bbc8f4a
+DIST github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz 8055 BLAKE2B 89cd909922bf9e565cd01e86b5970dfd55e0f4cbb3109ac052080013aa9a1dfef79761b5f3e08f6c2f2fe1cbcc99d7148e129461b7f95e266ff8253b38124732 SHA512 1455ebfeb0457da779eda76de3bdd5ef8aa18aa440563b3933d2013bff5b3742f245dd396cc9e93bbb343d166d048877b192b159b23b41c630128ac2e2ab26a5
+DIST github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz 4579 BLAKE2B d1c4bdac60073d25e0d953c2f48820c72e0da13b730f439abff498ff9fe09165ee006b021df4d6c925e9d364f5565025dd0fb8f10cad20d16db3e14aa32ddafd SHA512 69f9afd7e71c9dabb851b2592f99d565d83be9dea2ff55ee0208401debf6445e92d74973079f369d4028c64bcf6e9156a9144ba536cef8b6f72685762f28197e
 DIST minio-2019.01.10.00.21.20.tar.gz 9272639 BLAKE2B e8d64c436795894ad6e20cfc5acc193598312a6c1d7e20b58a1250f0bcc4791f004afd1dfed4d0e2d506f4690290d0d29596a263853c216456555792e84da5b2 SHA512 fe68bbd56f131ba4e189114b45fbf2f95925cce3a11384503c67debdc9eb04cf1c034f28f792adbcca373783cf74f3f57853a6e61241a5864898e19946c31e6f
 DIST minio-2019.01.16.21.44.08.tar.gz 9284989 BLAKE2B f54ecdd5892375c2bc8c3f2c8dc0144ee61c4e94342e12a27d8c55e1745b74c82a480a5562274553d2a5c968fc252ec8b95d0c708405089304b63520eb10405a SHA512 457c2adfe15a70c39fba8e8c7ac6dfa3dccc7265a725c932f57d4e45b5285859ce45701c8c7fa953300ad28322a46d1083f27e668ada5c3616c62337cdaf006c
 DIST minio-2019.01.23.23.18.58.tar.gz 9154650 BLAKE2B 4dd2f34edef4b994af25b1bc83fadc5993522f9ee9e54ef620fe54b43076f0fe147fe1343375343d6cc6c47ca31f762e9a033dfc2b3de76cfd55307f6fe36912 SHA512 49cb40f5eaccc2dd76aeb699ce8376d9d665860f38c93748b97cbd589dfeaf4301964659a32fe20a7174be3462c6269446810b9443a1688874c95a95acf5b22e
@@ -11,3 +115,4 @@ DIST minio-2019.03.06.22.47.10.tar.gz 9197298 BLAKE2B 3b74e2958d876e5c409290dfc0
 DIST minio-2019.03.13.21.59.47.tar.gz 9200988 BLAKE2B 56b2e6e3e4a7643d1e79c6038937b77dfaae632e38cd4049d79076920ee1c84ec75b738d5d069eb0c9c2b219cd2e39b129422191ab8f771386fde25338585edb SHA512 daa76f2e79acea86594189e3df5336d2bc29a5da21ebe36bc6de2fcf68135e4ea7529351a3878609adb9118553fa10088ac0fb1c746d23890b886fe7885a1b2c
 DIST minio-2019.03.20.22.38.47.tar.gz 9249505 BLAKE2B c3b5173575c266bf4a86276eafa1faecdcee7411fafb497452d0265c81d75adb06c2e2e05ed17dc6fec8b367ac8e389798ff4f98e4177eec8bbf786af05f7109 SHA512 33790bae9d2b33c53bf98bc20dc2f5d2653bcad2263f75d99523a9140d029adb16068eb8b376966ddaf96aad8eaf540bf4c8cc9d5c3fbb14c2aa0b63ac9fdefb
 DIST minio-2019.03.27.22.35.21.tar.gz 9261176 BLAKE2B 896162800b156d6cc04733fb80a4a0adf90b9bb5ff3561108e136e953dc60d4356c28fd6f28865977060d854f3887c23396139433e4a6c46fe9036a2b2e01336 SHA512 1fce454f0cbbb90bd8fff48c20a3a93cac464ea8dda1acb5687a566a5db641e912ff57a9b8e73192df5a7eb896f265945da734f89cf6c57dc9e2a0c8554f8d10
+DIST minio-2019.04.04.18.31.46.tar.gz 4814395 BLAKE2B 0f8d4f73092f9d51cf49f3e085511f2005deb2df153d803b845cdf0ea25cdff3fa2e2acd480be59ebe1b83f5ca87b6c665dccd72e36a4ca98a1837bf4aef5996 SHA512 edd646be6bb24d5a1afd10417bdd75a4f1290099d9eda99c6b6303442c8badd3cb376ca1e78b0fea18f3cb2421c229d651fe4c9c756fe0376979517b1d7ba005
diff --git a/net-fs/minio/minio-2019.04.04.18.31.46.ebuild b/net-fs/minio/minio-2019.04.04.18.31.46.ebuild
new file mode 100644
index 000000000000..275580fb0ffb
--- /dev/null
+++ b/net-fs/minio/minio-2019.04.04.18.31.46.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
+	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
+	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
+	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
+	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
+	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
+	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
+	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
+	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
+	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
+	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
+	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
+	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
+	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
+	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
+	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
+	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
+	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
+	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
+	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
+	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
+	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
+	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
+	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
+	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
+	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
+	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
+	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
+	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
+	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
+	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
+	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
+	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
+	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
+	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
+	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
+	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
+	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
+	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
+	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
+	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
+	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
+	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
+	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
+	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
+	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
+	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
+	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
+	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
+	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
+	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
+	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
+	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
+	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
+	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
+	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
+	     "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e"
+	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
+	     "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
+	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
+	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
+	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
+	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" )
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	pushd src/${EGO_PN} || die
+
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c1467ca79aa7..8337a39063d4 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,4 +1,5 @@
 DIST samba-4.10.0.tar.gz 18270804 BLAKE2B 53faf392aa4d09412f3d525410e290385f796dd7ef16e48d403ce8ff0466150312992c7459adee21ebf4c217c67a77d244b69f706dae16245058670a2ccd2087 SHA512 e82a8ec78cea666a653bddab066eaa22382f5b016b38f7618492e39f470d6f4c3ddd6dc21e9f0e9fde73ab98c4dd3da1a3823fd457f085ac14c36070b447ac90
+DIST samba-4.10.1.tar.gz 18280677 BLAKE2B e14142d51e35d0745d21832825af59216032df5316db4adb39044e3121911ac06bc3d7070c9a03f7fdda03e18f537293e9e3a4c4a78bd1c3c93244d23171ca39 SHA512 cfd86999d2eacb7700f03a25112211f4c79f64685d758744f690046728b5f5d66e4699d6cc9dc3e1ae108eb630ed18d9f62791ca101daabcebafa3cca2b3d838
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
diff --git a/net-fs/samba/samba-4.10.1.ebuild b/net-fs/samba/samba-4.10.1.ebuild
new file mode 100644
index 000000000000..3dd2aa09db23
--- /dev/null
+++ b/net-fs/samba/samba-4.10.1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index af1c79fba5d2..df5f7435251d 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 3ad3871db3fb..cde5412471fe 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/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
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
new file mode 100644
index 000000000000..b170db612f20
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 70996d7e66b4..3a460a25476e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,5 +4,6 @@ DIST node-v11.13.0.tar.xz 22085284 BLAKE2B e771c6109b4ca60b3037ec6a4f8138af75b50
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.0.tar.xz 15853760 BLAKE2B f1872b2ed43c447beff2b3278e49f9f10bbef58bba2640f6ecd889facfa4c5e5ae142f3b30721faae615df42c0870d7c09147930a259fa81c161b29559e2a340 SHA512 8ae9bfa0336a7d0d9f4a372330de1f877354a3d68bdd6977285787f81999012e42faf4ccef5981fe565ea9e2f18c5490b857bab29359fdf906b5a9fb14628858
+DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353dcfc118b1d309f1305099b145eb0eae33429554ab5d563366182b34b24ac78f8b78794f8d21318ebcd137622131 SHA512 23fb4e2580116a69a58514c2dc1f42098c7d594ea9d0cd6e7090f37e12e1805ca6546df66ee68fcb61b803e287ce34422f55129412f6bdcdaa97f515d9581e19
diff --git a/net-libs/nodejs/nodejs-6.17.1.ebuild b/net-libs/nodejs/nodejs-6.17.1.ebuild
new file mode 100644
index 000000000000..8db127221fd8
--- /dev/null
+++ b/net-libs/nodejs/nodejs-6.17.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.16.1:=
+	>=net-libs/http-parser-2.9.0:=
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-58.2:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i \
+		-e "s|lib/|${LIBDIR}/|g" \
+		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
+		tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myarch=""
+	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b56ad8d003f9..44eae6e68db7 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 227564a9a010..4139220e1d29 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,2 +1,2 @@
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d SHA512 1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434
+DIST gerbera-1.3.1.tar.gz 2803481 BLAKE2B b6fef9b2f5904eb778279e2e8ff1f9b3cc53713142390c67d68d86d80893957aa55309c23df878766a188c2917bc33b2788d153317d9ef1ce60e96a452039e18 SHA512 dbac60300d2f3e0b7eb520c9cb3026be3a4e1e4a3e1f5a1c6ddb2279ffe7c30ed5c1a59373f0d9e43de2cec751a5ff6644c3af53f866fc6a54f549ae934a26e1
diff --git a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild b/net-misc/gerbera/gerbera-1.3.1.ebuild
similarity index 97%
rename from net-misc/gerbera/gerbera-1.3.0-r1.ebuild
rename to net-misc/gerbera/gerbera-1.3.1.ebuild
index fcdb0195c5e0..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.1.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${P}.config" config.xml
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
 	fperms 0640 /etc/${PN}/config.xml
 	fowners root:gerbera /etc/${PN}/config.xml
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 8bb0d316b836..54d2f7c35f9a 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1 +1,2 @@
 DIST miniupnpd-2.1.20190210.tar.gz 235093 BLAKE2B d86b4a73ebfe6b5f3665b92624e7eac36718fffea058c0e7d2cb4af2c0871534c7f7ec56ade6c3cb2e13215a77971173259f912efd61a37e41d0f2f0a4596e5c SHA512 d664d5f61a0e2e71086aa520cb91af9f7f9b8b34268a76d570bbca271d86eab4976655a1fec1d21be80a93e357a0cb185281037604a0cfc00e4944d8e8b6f664
+DIST miniupnpd-2.1.20190403.tar.gz 235909 BLAKE2B 121aa74d1337dbdaec280edd13a688c42c7af49e1f6d44cac94701e878fe554adb8b878ac2c075391124cee14b5c01d57987024fadf95e4508ed3b3047bad543 SHA512 63fbd09d769c7a8ffba92cd5724bc04e4553085b95405daa905ac77f95d2fbcf1852fd8ff7171e2fe39aac7ac76ebae87142fe5dc2e57932c89d8d98d472034b
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
new file mode 100644
index 000000000000..673b340fb090
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 983484905f6d..d30a9df75e4e 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1 +1,2 @@
+DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
new file mode 100644
index 000000000000..f7ea0d8471dc
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	udev? ( >=virtual/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.22.0:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 4304673a3ee4..f7b659c02e64 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1 +1,2 @@
 DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
+DIST owncloudclient-2.5.4.11654.tar.xz 16720764 BLAKE2B f970e3ed5fbe465f93e9c4f4c2106604a08ada765f8692e1287878b7deb44ac92c53608f34b24a9c913510a5625c4e980c9ac2646689700e38e78822d3e98d21 SHA512 70b687d7ace4d1335388ebf60bf65137943ff0cadfefdcaffb09539c656889233100033f28db7d03f3d48f4b956aeed476bb458f8ef16ac5461287cf02e226d9
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
new file mode 100644
index 000000000000..37f3df0acddb
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild b/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
index 1c7d25f0f8bd..8667bb035c0c 100644
--- a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
+++ b/net-misc/shigofumi/shigofumi-0.3-r1.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
@@ -9,7 +9,7 @@ inherit autotools
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
 	inherit git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
index 1c7d25f0f8bd..8667bb035c0c 100644
--- a/net-misc/shigofumi/shigofumi-9999.ebuild
+++ b/net-misc/shigofumi/shigofumi-9999.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
@@ -9,7 +9,7 @@ inherit autotools
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
 	inherit git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 52fde25ab3f0..dab9093e8760 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,10 +25,10 @@ DEPEND="
 	${RDEPEND}
 	app-text/yodl
 "
-
-RESTRICT="test
-	ssl? ( readline? ( bindist ) )"
-
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
 DOCS=(
 	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 )
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 97b3c5a40655..79d60d0897b3 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,2 +1,3 @@
 DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
 DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91b5b413f1a5592da6bea690a2d6b864b64a1add1c4114085def7a73312a88cd1cf1c12434c6535f79de222d9a SHA512 42d59ddb3abec6ff30e2be890ceeec35fc144acd8e2def25f5280c2f8c21e6fd54dc71217e9ca7fb1d4f0470716bf288e90501e8e6e39b09938e3f5710a3016a
+DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3.ebuild
new file mode 100644
index 000000000000..b9c1aa3290a5
--- /dev/null
+++ b/net-misc/wget/wget-1.20.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with idn libidn)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED%/}"/etc/wgetrc \
+		"${ED%/}"/usr/share/man/man1/wget.1 \
+		"${ED%/}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 00c0c88bc9fd..7587ffdedaf5 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index ccccf166d1b2..c6960d218168 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1 +1,2 @@
 DIST iwd-0.14.tar.xz 700844 BLAKE2B 69f3a1e5ead28cb602e7638e44d2a42a1b25831b837bf5f1d3436d3832a0548da7c3afe9f748688c194cf9e9bc5ea9303924ca1d36dea36d9e2233c245fc25eb SHA512 91713b3cbe8830abb95705e67c7b66f1ced368fe83eeaad36170da9df22b965e97485068e9342e09291aee669890de8f328e33fc3f092ba45097f523d83c7484
+DIST iwd-0.16.tar.xz 717880 BLAKE2B b4d1f3ebfc2f98920b205aefdf340cd55d803967a2b776e0798f1728cbd78e6be9b862f77b423ef2555b5f990341ef9b1e6f2aaf7460f08f37205a7edbaeda82 SHA512 33b10516fb203eb92651e18ebff8448874452fad9425470bf4306b4d75a512d386561ed4fcd251c54175ac6953e29f6574175e4e9b18c88e55009f670f29ddb1
diff --git a/net-wireless/iwd/iwd-0.16.ebuild b/net-wireless/iwd/iwd-0.16.ebuild
new file mode 100644
index 000000000000..93969ee59cb0
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.16.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index b037416528c5..93969ee59cb0 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bf03885db039..148712d031d2 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 1aa2ce851202..ce49145483d3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Zac Medico <zmedico@gentoo.org> (04 Apr 2019)
+# Ebuild is not needed since consumers use EGO_VENDOR.
+# Removal in 30 days.  Bug #656972.
+dev-go/go-resiliency
+
 # Michał Górny <mgorny@gentoo.org> (03 Apr 2019)
 # Does not build with ncurses[tinfo].  The current version is from 2004,
 # and it seems to have been abandoned upstream.
diff --git a/profiles/updates/1Q-2019 b/profiles/updates/1Q-2019
index 10ac282f20d6..12ddfd6bdb9f 100644
--- a/profiles/updates/1Q-2019
+++ b/profiles/updates/1Q-2019
@@ -13,3 +13,4 @@ move net-misc/networkmanager-vpnc net-vpn/networkmanager-vpnc
 move net-misc/networkmanager-sstp net-vpn/networkmanager-sstp
 move gnome-extra/gnome-tweak-tool gnome-extra/gnome-tweaks
 move app-portage/eclass-manpages app-doc/eclass-manpages
+move app-editors/latexila app-editors/gnome-latex
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7c1b4fd998f6..87e75c3ab244 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -422,14 +422,14 @@ app-editors/fe:sendmail - Send mail after editor abend
 app-editors/gedit-plugins:charmap - Insert special characters just by clicking on them
 app-editors/gedit-plugins:git - Shows document changes related to git's HEAD
 app-editors/gedit-plugins:terminal - Embed a terminal in the bottom pane
+app-editors/gnome-latex:latexmk - Install dev-tex/latexmk (used by default for the build tools)
+app-editors/gnome-latex:rubber - Install dev-tex/rubber (can be used for the build tools)
 app-editors/gvim:cscope - Enable cscope interface
 app-editors/gvim:gtk3 - Enable GTK+3 interface
 app-editors/gvim:netbeans - Include netbeans external editor integration support
 app-editors/gvim:racket - Enable support for Scheme using dev-scheme/racket
 app-editors/jasspa-microemacs:nanoemacs - Build NanoEmacs instead of MicroEmacs
 app-editors/joe:xterm - Enable full xterm clipboard support
-app-editors/latexila:latexmk - Install dev-tex/latexmk (used by default for the build tools)
-app-editors/latexila:rubber - Install dev-tex/rubber (can be used for the build tools)
 app-editors/leafpad:emacs - Enable Emacs key theme
 app-editors/mousepad:gtk3 - Use GTK+3 instead of GTK+2
 app-editors/nano:debug - Enable debug messages and assert warnings. Note that these will all be sent straight to stderr rather than some logging facility.
@@ -2448,7 +2448,6 @@ dev-libs/libmail:apop - Enables the APOP authentication method
 dev-libs/libmemcached:hsieh - Use Hsieh hash algorithm.
 dev-libs/libmemcached:libevent - Use the libevent event loop interface.
 dev-libs/libmemcached:sasl - Use sasl auth for communications.
-dev-libs/libmspack:utils - Enables building cabrip, chmextract, msexpand and oabextract
 dev-libs/libnfc:pcsc-lite - Enable NFC drivers that require pcsc-lite
 dev-libs/libnl:doc - Install development documentation
 dev-libs/libnl:python - Install experimental dev-lang/python bindings
@@ -3693,6 +3692,7 @@ gnome-extra/synapse:indicator - Build support for application indicators using d
 gnome-extra/synapse:plugins - Build support for plugins using net-libs/rest
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
+gnustep-apps/sogo:activesync - Build the ActiveSync support code
 gnustep-base/gnustep-back-art:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-cairo:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-xlib:xim - Enable X11 XiM input method
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 43b9fa914dc3..0dde04cd8b32 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 60d8bfab8b28..fbfcc15fa791 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,2 +1,3 @@
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
 DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
+DIST gpxsee-7.5.tar.gz 4302319 BLAKE2B f31aba249b87a85b7d5e4b2e3bb6c300b682a0f0e77d82b8151ffbd621664840782a1894277249e5f858a6837cf0580bb32748a04684157999edc64295f4192d SHA512 ff55267abeda8970282bbbadc9fdf0c72120aa25cf6f3ce95de77ea330087e36a0c64332ff9cd1c569bac24bed891dc265ded57587e7fb258b30e382fa31b093
diff --git a/sci-geosciences/gpxsee/gpxsee-7.5.ebuild b/sci-geosciences/gpxsee/gpxsee-7.5.ebuild
new file mode 100644
index 000000000000..6b28d5dd63ab
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr"
+inherit qmake-utils l10n xdg-utils gnome2-utils
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="http://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	local lang
+	dobin ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+
+	insinto /usr/share/${PN}/translations
+	for lang in lang/*.qm; do
+		[ -f "${lang}" ] && doins "${lang}"
+	done
+
+	insinto /usr/share/applications
+	doins pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	insinto /usr/share/pixmaps
+	doins icons/${PN}.png
+}
+
+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
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 142703fb5488..f38aefce0f41 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,2 +1,3 @@
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
+DIST qmapshack-1.12.3.tar.gz 12029443 BLAKE2B 8d7f117c8379f7181ce68f79f460f59342cf654179c8b85839fe003e06167765e3e2292e14b4bc71c3ba1aeb388fcbb77faccdd57748335c1df8500f9e52ba41 SHA512 01a2b73f2f432a24b614c4a325e0b0a2aaf5b6ef75c5a7fbeb2be341adc7c46faa71cf7e9f4fdeb769d546b7a760be553a38ac6cc1c5c2c2d044edd37f550a85
diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild
new file mode 100644
index 000000000000..6dfd76c879ad
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/designer:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+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
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 3abb42a7e81e..2d2b0e620ad6 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/maxima/files/emacs-27.patch b/sci-mathematics/maxima/files/emacs-27.patch
deleted file mode 100644
index ded116599008..000000000000
--- a/sci-mathematics/maxima/files/emacs-27.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el
---- maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el	2016-04-03 03:42:45.000000000 +0600
-+++ maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el	2018-09-05 20:29:46.843231210 +0700
-@@ -528,5 +528,5 @@
-     (set-process-filter imaxima-gs-process 'imaxima-gs-filter)
-     (imaxima-gs-wait)
--    (process-kill-without-query imaxima-gs-process nil)
-+    (set-process-query-on-exit-flag imaxima-gs-process nil)
-     (unless (eq (process-status imaxima-gs-process) 'run)
-       (setq output (shell-command-to-string (concat imaxima-gs-program " -h")))
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index de12e17bb2b5..6d23b9f9f2af 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
new file mode 100644
index 000000000000..7c3930d38474
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="minimal vanilla"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${P}/profiles
+
+pkg_setup() {
+	if use vanilla; then
+		EGIT_REPO_URI="https://gitlab.com/apparmor/apparmor.git"
+		EGIT_BRANCH="master"
+	else
+		EGIT_REPO_URI="https://github.com/kensington/apparmor.git"
+		EGIT_BRANCH="gentoo"
+	fi
+}
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a4555c8794f0..7aa00d0b5ccd 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dbus/dbus-1.12.12-r2.ebuild b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
new file mode 100644
index 000000000000..44d36d8040b2
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+# autoconf-archive-2019.01.06 blocker added for bug #674830
+# Please check on bumps if the blocker is still necessary.
+BDEPEND="
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	<sys-devel/autoconf-archive-2019.01.06
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
+	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
+	test? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-dbus )
+"
+
+DOC_CONTENTS="
+	Some applications require a session bus in addition to the system
+	bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-enable-elogind.patch"
+	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+)
+
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 -1 -1 messagebus
+
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Tests were restricted because of this
+	sed -i \
+		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+		-e '/"dispatch"/d' \
+		bus/test-main.c || die
+
+	default
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
+	# required for bug 263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in > "${WORKDIR}"/dbus.initd || die
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local docconf myconf testconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic' wrt #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		--disable-apparmor
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable elogind)
+		$(use_enable systemd)
+		$(use_enable user-session)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-dbus-user=messagebus
+		$(use_with X x)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-daemon
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# after the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	newinitd "${WORKDIR}"/dbus.initd dbus
+
+	if use X; then
+		# dbus X session script (#77504)
+		# turns out to only work for GDM (and startx). has been merged into
+		# other desktop (kdm and such scripts)
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/80-dbus
+	fi
+
+	# needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+	# let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO
+	readme.gentoo_create_doc
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
+	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+
+	if use user-session; then
+		ewarn "You have enabled user-session. Please note this can cause"
+		ewarn "bogus behaviors in several dbus consumers that are not prepared"
+		ewarn "for this dbus activation method yet."
+		ewarn
+		ewarn "See the following link for background on this change:"
+		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
+		ewarn
+		ewarn "Known issues are tracked here:"
+		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
+	fi
+}
diff --git a/sys-apps/dbus/files/dbus.initd.in b/sys-apps/dbus/files/dbus.initd.in
new file mode 100644
index 000000000000..10c7201be478
--- /dev/null
+++ b/sys-apps/dbus/files/dbus.initd.in
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+description="An IPC message bus daemon"
+pidfile="@rundir@/dbus.pid"
+command="/usr/bin/dbus-daemon"
+command_args="--system"
+
+dbus_socket="@rundir@/dbus/system_bus_socket"
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+start_pre() {
+	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+
+	# We need to test if /var/run/dbus exists, since script will fail if it does not
+	checkpath -q -d "@rundir@/dbus"
+}
+
+stop_post() {
+	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
+}
+
+reload() {
+	ebegin "Reloading D-BUS messagebus config"
+	dbus-send --print-reply --system --type=method_call \
+			--dest=org.freedesktop.DBus \
+			/ org.freedesktop.DBus.ReloadConfig > /dev/null
+	eend $?
+}
diff --git a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
deleted file mode 100644
index e915150adb58..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Gokturk Yuksek <gokturk@binghamton.edu>
-Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag
-
-When start-stop-daemon starts a rngd instance configured to use a tty
-device as its entropy source, the application crashes due to not being
-able to read from the entropy device. This is caused by
-start-stop-daemon calling setsid() before executing rngd, which
-disassociates the controlling terminal. When rngd attempts to open a
-hardware entropy source that's a tty device, per POSIX rules, the
-device becomes the controlling terminal for the process. Then rngd
-calls daemon(), which internally calls setsid(), and consequently
-disassociates the controlling terminal for the child. Meanwhile the
-parent rngd process exits. This results in tty device hanging up. By
-looking at the strace logs attached to the bug, it can be observed
-that although the parent rngd process is able to read() from the
-entropy source successfully, further attempts to read() by the child
-rngd process return 0. This complies with the POSIX, which states that
-read() calls on a hung up terminal shall return 0.
-
-Note that when rngd is started without start-stop-daemon, this problem
-does not happen because at the time of opening the entropy source rngd
-already has a controlling terminal.
-
-Prevent the entropy source from becoming the controlling terminal by
-passing 'O_NOCTTY' flag to open() when opening an entropy source. This
-flag prevents a tty device from becoming the controlling terminal for
-a process without a controlling terminal at the time of open().
-
-Thanks to John Bowler <jbowler@acm.org> for debugging the problem and
-pinpointing the issue as well as confirming the fix.
-
-Gentoo-Bug-URL: https://bugs.gentoo.org/556456
-Reported-By: John Bowler <jbowler@acm.org>
-
---- rng-tools-rng-tools-6/rngd_entsource.c
-+++ rng-tools-rng-tools-6/rngd_entsource.c
-@@ -162,7 +162,7 @@
- 	struct sysfs_attribute *rngavail;
- 	char buf[16];
- 
--	ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY);
-+	ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY | O_NOCTTY);
- 	if (ent_src->rng_fd == -1) {
- 		message(LOG_DAEMON|LOG_DEBUG, "Unable to open file: %s", ent_src->rng_fname);
- 		return 1;
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 30f8aac4e80e..1251ddef58cc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,4 @@
 DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
+DIST systemd-242-rc3.tar.gz 7818751 BLAKE2B 594555f3ecc39d29f57653614f8f03812cefc759a3faca3cab21aac79820e8851d70e94da7922a02dd0342ff3693c3007b0379cad40d049e55ba3a25c3b72e1c SHA512 89471959adfe8b80f8ae8993463cecbcb4c7115f2bf36d256eff1a1bbbe10ac6ce4301763f98594ee8faf547ec1187ff872b1bed0207e092e300345af92baaad
diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild
index 47f33c6fcff7..fc3afc337548 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-242_rc3.ebuild b/sys-apps/systemd/systemd-242_rc3.ebuild
new file mode 100644
index 000000000000..c167a2fd0b76
--- /dev/null
+++ b/sys-apps/systemd/systemd-242_rc3.ebuild
@@ -0,0 +1,471 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 852df051610d..c167a2fd0b76 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -336,16 +336,6 @@ multilib_src_install_all() {
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
 
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
-
 	local udevdir=/lib/udev
 	use split-usr || udevdir=/usr/lib/udev
 
@@ -402,6 +392,20 @@ migrate_locale() {
 	fi
 }
 
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
 pkg_postinst() {
 	newusergroup() {
 		enewgroup "$1"
@@ -437,6 +441,14 @@ pkg_postinst() {
 
 	systemd_reenable systemd-networkd.service systemd-resolved.service
 
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
 	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
 		ebegin "Reexecuting system manager"
 		systemctl daemon-reexec
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 0f93dbb5dbde..6c08cf8742c3 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 0e505071b167..92dcb113db17 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,5 +1,8 @@
 DIST keystone-14.0.1.tar.gz 1526741 BLAKE2B 5ae1a6f0e7a7ce737b3a0fdbd2900e8cb1541ec3b1e08228d4abf58d8021a06a6c9db654ef71c22636436f2601bd49d4934f24650e2a44c101c9610ed7b011af SHA512 87065a16ca70dc9115d331f1e0f3669ac9661f5172f9e8afbecef48e7dd9a4726438b4d757fa54bbd6095a5543427dc913f90a765e83ffb30284b1f8dbfbb8e7
+DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b SHA512 ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
 DIST keystone.conf.sample-14.0.1 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
+DIST keystone.conf.sample-14.1.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.policy.yaml.sample-14.0.1 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
+DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
diff --git a/sys-auth/keystone/keystone-14.1.0.ebuild b/sys-auth/keystone/keystone-14.1.0.ebuild
new file mode 100644
index 000000000000..428ffc5ea13e
--- /dev/null
+++ b/sys-auth/keystone/keystone-14.1.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.38.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+	doins etc/policy.v3cloudsample.json
+	doins etc/keystone-paste.ini
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 2d33fe6f316e..0c5fe4996f4e 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index e7354d61020b..ec94cf709836 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,3 @@
-DIST tgt-1.0.72.tar.gz 296698 BLAKE2B 6625bf87b37f4683aaf0c29264e69e400c6d238c9eaa7d9bb6fd46a76b542a8477ad8c7e9913d3dde70caaf02c323a2c01a3bd78b2d092829f4530015225012f SHA512 4fdb1b8f3c2487f66629024132f7fa53ab69b9eba67d380fb18aa2d9c143e77bdf808b3ff8d1e2bf1d4420cf1792944d6f79731ddbb095d52b53d573d9f1281c
-DIST tgt-1.0.73.tar.gz 296814 BLAKE2B a3c81c00f716678aa9388f6a4562bd0b6fe0e2c705aee9655f942ffafae4bab3bbbaff521a8b7aefab208a354e0c1c617b85cdd08247a77d1026d0482d2b6528 SHA512 e6410f16c54f71d9a33d511438169a0ca305a7b9a9dd6abbaae9f0b31c18223fa1f3a11b575322d3bb94df129b4f9b186079a7d7cbd27e31734151154edab1da
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
 DIST tgt-1.0.75.tar.gz 297374 BLAKE2B c3db3701980b78328decd857b3a031f1e735553b33163bc012b55084a0c1ce803e90b93771c6516542168448ab872a641064c90bd01444b49c353c35a37e2985 SHA512 e2da4f49b1b89b67084a535abc1f6c28f289d25a6fce1cd6a9238df64c7a1e29eb11f4d074cd6dfda4cc37524e0f6831fbdee8d32a03d50ff156bc1369de04d8
+DIST tgt-1.0.76.tar.gz 297349 BLAKE2B b5f954b7497fd54d2156bb8ae7c90c2e158e59dd5cd2f8ea25a87403b1d4c491ce07d4968d27f13d5a195a4824554f98a07091f500cb520dffd856454736ceeb SHA512 4c25f8f0553f95d58ed694e44f85bddbacbebe12d531725b7db03de5f6728c85a9b8968a39bea5b2126aecde9dd254855d9d6e8686c310fa53daf976738edfe1
diff --git a/sys-block/tgt/tgt-1.0.72.ebuild b/sys-block/tgt/tgt-1.0.72.ebuild
deleted file mode 100644
index bacdb72d61a6..000000000000
--- a/sys-block/tgt/tgt-1.0.72.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-MY_TREE="8f94634"
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-CDEPEND="dev-perl/Config-General
-	dev-libs/libxslt
-	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.69-sysmacros.patch #580594
-
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-	use rbd && myconf="${myconf} CEPH_RBD=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd.initd tgtd
-	newconfd "${FILESDIR}"/tgtd.confd tgtd
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.75.ebuild b/sys-block/tgt/tgt-1.0.75.ebuild
index fbac7f620a1a..faa70d87cac7 100644
--- a/sys-block/tgt/tgt-1.0.75.ebuild
+++ b/sys-block/tgt/tgt-1.0.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-block/tgt/tgt-1.0.73.ebuild b/sys-block/tgt/tgt-1.0.76.ebuild
similarity index 93%
rename from sys-block/tgt/tgt-1.0.73.ebuild
rename to sys-block/tgt/tgt-1.0.76.ebuild
index 0677386365d7..740ed20c869f 100644
--- a/sys-block/tgt/tgt-1.0.73.ebuild
+++ b/sys-block/tgt/tgt-1.0.76.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic toolchain-funcs
 
-MY_TREE="013223d"
+MY_TREE="df08164"
 
 DESCRIPTION="Linux SCSI target framework (tgt)"
 HOMEPAGE="http://stgt.sourceforge.net"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index bea0f23c577e..a287d2b6bd8e 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
new file mode 100644
index 000000000000..db9b7d0a137b
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
@@ -0,0 +1,304 @@
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+Description: Force the linker to put all sections into a single PT_LOAD
+ segment. This is required when using binutils >= 2.31 which writes two PT_LOAD
+ segments by default. This is not supported by the wrapper.c script used to
+ convert the shared object into an elf binary.
+Forwarded: https://www.syslinux.org/archives/2018-August/026167.html
+
+---
+ efi/i386/syslinux.ld   | 37 +++++++++++++++++++++----------------
+ efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++----------------
+ 2 files changed, 42 insertions(+), 32 deletions(-)
+
+diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
+index bab3fc7..5b4589d 100644
+--- a/efi/i386/syslinux.ld
++++ b/efi/i386/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
+diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
+index 450641c..cad28a8 100644
+--- a/efi/x86_64/syslinux.ld
++++ b/efi/x86_64/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+ OUTPUT_ARCH(i386:x86-64)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 026381ff5364..5ad853d33dbf 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -45,6 +45,7 @@ src_prepare() {
 	rm -f gethostip #bug 137081
 
 	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+	epatch "${FILESDIR}"/${P}-singleloadsegment.patch #662678
 
 	# Don't prestrip or override user LDFLAGS, bug #305783
 	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 95470d7d1fb3..f292348c7d8a 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/ceph-13.2.5-r1.ebuild b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-13.2.5-r1.ebuild
rename to sys-cluster/ceph/ceph-13.2.5-r2.ebuild
index 7d088a08ac60..2ef0f19a4010 100644
--- a/sys-cluster/ceph/ceph-13.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 	"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.0-r3.ebuild
rename to sys-cluster/ceph/ceph-14.2.0-r4.ebuild
index 01499ef0ffe8..61c4b21e9f8b 100644
--- a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 )
 
 # dpdk and ninja don't get along
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
new file mode 100644
index 000000000000..be133c121d0c
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
@@ -0,0 +1,17 @@
+--- ceph-13.2.1/cmake/modules/Distutils.cmake.old	2018-07-26 17:39:56.000000000 -0000
++++ ceph-13.2.1/cmake/modules/Distutils.cmake	2018-12-24 05:43:51.566174070 -0000
+@@ -58,8 +62,13 @@
+ function(distutils_install_cython_module name)
+   get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
+   get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
+-  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
++  string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
++  list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
++  list(APPEND cflags -D'void0=dead_function\(void\)')
++  list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
++  string(REPLACE ";" " " cflags "${cflags}")
++  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
+   set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
+   install(CODE "
+     set(ENV{CC} \"${PY_CC}\")
+     set(ENV{LDSHARED} \"${PY_LDSHARED}\")
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index a57bcbf8a0d1..ceb294f31c37 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,2 @@
-DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1
-DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B db837add9d74e2acb312bd974f00b52d269f1c5995036b468f309da43605b817fac16f17c30e96c27e17657708870d329b41eafa9ad214d8cb5f1b4fbb468182 SHA512 874c6ee77be54a0bcd6d36b67f8e99d12dabd85433dd1f0e026b7994746679cc7ffebcf721445dfd1714f89c7594fc0b0137e725d220d3bb45fd325e64e16185
+DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
new file mode 100644
index 000000000000..dfa1642c7d7e
--- /dev/null
+++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch
@@ -0,0 +1,78 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2019-02-25 10:37:25.000000000 -0500
++++ b/galerautils/src/SConscript	2019-03-07 09:51:27.163226469 -0500
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname', 'machine')
++Import('env', 'sysname', 'machine')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -39,22 +39,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    if machine != 'ppc64' and machine != 'ppc64le':
+-        crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2019-03-07 09:44:38.588841625 -0500
++++ b/SConstruct	2019-03-07 09:50:06.305952407 -0500
+@@ -67,7 +67,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -120,33 +120,6 @@
+ if gcov:
+     opt_flags = opt_flags + ' --coverage -g'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-elif x86:
+-    if bits == 32:
+-        if machine == 'x86_64':
+-            compile_arch = ' -mx32'
+-        else:
+-            compile_arch = ' -m32 -march=i686'
+-            if sysname == 'linux':
+-                link_arch = ' -Wl,-melf_i386'
+-    else:
+-        if machine == 'ppc64':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64ppc'
+-        elif machine == 'ppc64le':
+-          compile_arch = ' -mtune=native'
+-          link_arch = ' -Wl,-melf64lppc'
+-        else:
+-          compile_arch = ' -m64'
+-          if sysname == 'linux':
+-            link_arch = ' -Wl,-melf_x86_64'
+-        link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch'
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ system_asio= int(ARGUMENTS.get('system_asio', 1))
diff --git a/sys-cluster/galera/galera-25.3.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild
deleted file mode 100644
index bcb3d49b1677..000000000000
--- a/sys-cluster/galera/galera-25.3.23.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-3-${PV}"
-
-inherit scons-utils toolchain-funcs user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
-HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse4_2 garbd test"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.41:0=
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.10.1[ssl]
-	<dev-cpp/asio-1.12.0
-	"
-#Run time only
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-# Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd -1 -1 -1 garbd
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled dev-cpp/asio
-	rm -r "${S}/asio" || die
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-	# Uses hardware specific code that seems to depend on SSE4.2
-	if use cpu_flags_x86_sse4_2 ; then
-		append-cflags -msse4.2
-	else
-		append-cflags -DCRC32C_NO_HARDWARE
-	fi
-	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
-	# and -Wold-style-cast
-	MYSCONS=(
-		tests=$(usex test 1 0)
-		strict_build_flags=0
-		system_asio=1
-	)
-}
-
-src_compile() {
-	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
-}
-
-src_install() {
-	dodoc scripts/packages/README scripts/packages/README-MySQL
-	if use garbd ; then
-		dobin garb/garbd
-		newconfd "${FILESDIR}/garb.cnf" garbd
-		newinitd "${FILESDIR}/garb.sh" garbd
-		doman man/garbd.8
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}
diff --git a/sys-cluster/galera/galera-25.3.24.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
similarity index 80%
rename from sys-cluster/galera/galera-25.3.24.ebuild
rename to sys-cluster/galera/galera-25.3.26.ebuild
index b86933238352..cb0e18917305 100644
--- a/sys-cluster/galera/galera-25.3.24.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
-inherit scons-utils toolchain-funcs user flag-o-matic
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
 HOMEPAGE="http://galeracluster.com"
-SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -20,19 +22,19 @@ CDEPEND="
 	dev-libs/openssl:0=
 	>=dev-libs/boost-1.41:0=
 	"
-DEPEND="${DEPEND}
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
 	${CDEPEND}
 	dev-libs/check
-	>=sys-devel/gcc-4.4
 	>=dev-cpp/asio-1.10.1[ssl]
 	<dev-cpp/asio-1.12.0
 	"
 #Run time only
 RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
 # Respect {C,LD}FLAGS.
-PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" )
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
 
 pkg_preinst() {
 	if use garbd ; then
diff --git a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
index c7f53bc60cd8..32c182d224bd 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.26.4.ebuild b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
index 67055d3a67af..ddb38e2c5e14 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-cluster/gasnet/gasnet-1.28.0.ebuild b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
index 9a32e2c0b5c5..ffe4c765a461 100644
--- a/sys-cluster/gasnet/gasnet-1.28.0.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.28.2.ebuild b/sys-cluster/gasnet/gasnet-1.28.2.ebuild
index 52282995fdde..4af06d5d78c8 100644
--- a/sys-cluster/gasnet/gasnet-1.28.2.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.28.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/gasnet/gasnet-1.30.0.ebuild b/sys-cluster/gasnet/gasnet-1.30.0.ebuild
index 52282995fdde..4af06d5d78c8 100644
--- a/sys-cluster/gasnet/gasnet-1.30.0.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit autotools toolchain-funcs multilib
 
 MY_P="${PN^^[gasn]}-${PV}"
 DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
-HOMEPAGE="http://gasnet.lbl.gov/"
-SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+HOMEPAGE="https://gasnet.lbl.gov/"
+SRC_URI="https://gasnet.lbl.gov/download/${MY_P}.tar.gz"
 
 SOVER="${PV%%.*}"
 LICENSE="BSD"
diff --git a/sys-cluster/swift/swift-2.21.0.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild
similarity index 96%
rename from sys-cluster/swift/swift-2.21.0.ebuild
rename to sys-cluster/swift/swift-2.21.0-r1.ebuild
index d96686a8d7fa..ec5ee0cd41ee 100644
--- a/sys-cluster/swift/swift-2.21.0.ebuild
+++ b/sys-cluster/swift/swift-2.21.0-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="proxy account container object +memcached"
+IUSE="account container doc +memcached object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -109,6 +109,11 @@ python_install_all() {
 		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
 	fi
 
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
 	fowners root:swift "/etc/swift" || die "fowners failed"
 	fperms 0750 /etc/swift
 }
diff --git a/sys-cluster/swift/swift-2019.1.9999.ebuild b/sys-cluster/swift/swift-2019.1.9999.ebuild
index d96686a8d7fa..ec5ee0cd41ee 100644
--- a/sys-cluster/swift/swift-2019.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2019.1.9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="proxy account container object +memcached"
+IUSE="account container doc +memcached object proxy"
 REQUIRED_USE="|| ( proxy account container object )"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -109,6 +109,11 @@ python_install_all() {
 		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
 	fi
 
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	fi
+
 	fowners root:swift "/etc/swift" || die "fowners failed"
 	fperms 0750 /etc/swift
 }
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8ae7bdbaa96e..b9db6a4ab776 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/binutils-2.31.1-r4.ebuild b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
index 89cac2cbcbba..28dc00ffcacb 100644
--- a/sys-devel/binutils/binutils-2.31.1-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch b/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
new file mode 100644
index 000000000000..ed83244de53f
--- /dev/null
+++ b/sys-devel/llvm/files/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
@@ -0,0 +1,41 @@
+From 1f68002cb725c6a8fb5ca8425c1c86495a053f4f Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 4 Apr 2019 14:21:38 +0000
+Subject: [PATCH] [llvm] [cmake] Add additional headers only if they exist
+
+Modify the add_header_files_for_glob() function to only add files
+that do exist, rather than all matches of the glob.  This fixes CMake
+error when one of the include directories (which happen to include
+/usr/include) contain broken symlinks.
+
+Differential Revision: https://reviews.llvm.org/D59632
+
+llvm-svn: 357701
+---
+ llvm/cmake/modules/LLVMProcessSources.cmake | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/LLVMProcessSources.cmake b/cmake/modules/LLVMProcessSources.cmake
+index 7cbd2863500..d0be0e8b3ba 100644
+--- a/cmake/modules/LLVMProcessSources.cmake
++++ b/cmake/modules/LLVMProcessSources.cmake
+@@ -30,7 +30,15 @@ endmacro(add_td_sources)
+ 
+ function(add_header_files_for_glob hdrs_out glob)
+   file(GLOB hds ${glob})
+-  set(${hdrs_out} ${hds} PARENT_SCOPE)
++  set(filtered)
++  foreach(file ${hds})
++    # Explicit existence check is necessary to filter dangling symlinks
++    # out.  See https://bugs.gentoo.org/674662.
++    if(EXISTS ${file})
++      list(APPEND filtered ${file})
++    endif()
++  endforeach()
++  set(${hdrs_out} ${filtered} PARENT_SCOPE)
+ endfunction(add_header_files_for_glob)
+ 
+ function(find_all_header_files hdrs_out additional_headerdirs)
+-- 
+2.21.0
+
diff --git a/sys-devel/llvm/llvm-8.0.0-r1.ebuild b/sys-devel/llvm/llvm-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..212c6de12274
--- /dev/null
+++ b/sys-devel/llvm/llvm-8.0.0-r1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
+
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	exegesis? ( dev-libs/libpfm:= )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	!doc? ( ${PYTHON_DEPS} )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# Fix failures when /usr/include contains dangling symlinks
+	# https://bugs.gentoo.org/674662
+	eapply "${FILESDIR}"/8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
+
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "10llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python 2.7 along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index b8be38b5cade..7d4f2ee58971 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-		http://repo.or.cz/r/${PN}.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
@@ -26,6 +25,8 @@ RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
 		Makefile || die
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 604ee551e2dd..4b19c4c15fa2 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 7da838752d13..8fca7add1357 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>floppym@gentoo.org</email>
-    <name>Mike Gilbert</name>
-  </maintainer>
   <maintainer type="person">
     <email>slyfox@gentoo.org</email>
     <name>Sergei Trofimovich</name>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index dfc695be6d53..a33cd6b97886 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b7e4d3d38210..a0f2cfa2e567 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,27 +1,9 @@
 DIST genpatches-4.14-107.base.tar.xz 2483192 BLAKE2B c24644d6f0cba78ea7553419b910b2dbf9de7dc1d3c216025608aef52ee2fbbd7e2655d28d86202bbd1e5cc2d915bc6c78b0a57714573c6413d46244d069b771 SHA512 f6b12e5c851b7ddc665069d63b06a51d8fc95b470ef5ca37b56fc8db1e8136967b36f6ea23f66dd931b67e0b390aa8c2d598d78e13737f34715defcb0a311763
 DIST genpatches-4.14-107.experimental.tar.xz 5220 BLAKE2B de01dee896481444c62388ed1be5e0935f9a2d5a256f76fcb953c44fd6e4e9900d29b0c9983da1704a97dab543fc8802b4781cda96860594b2603a835986b799 SHA512 41b4770da481cdb6af8b978cc3c778332724f1d535bdec1cf8b110e629cc1e58840ef717044e121824f2366859755745dd1089601f6ad43111ac4db87c4bd938
 DIST genpatches-4.14-107.extras.tar.xz 17500 BLAKE2B 09de86f6b29e5bedf910bb64eb16ba85de0675c1e095563bd049e39301c1c974ffc8715aa7b4118af9a4b8d7f2fd67582aa636ebc8834ba10c8edda8fe8bdfe8 SHA512 ef6f95c4987a8cf78295a5bb6992c8cac8935135e4439d36a56da676dc04f8cddea52aef29311ffc7a22a2aa22652b44d58f9a6a1a8ea0f6e4250f85e527d696
-DIST genpatches-4.14-109.base.tar.xz 2503640 BLAKE2B 470b7d9b18ed8053a30218462cdde101e1d2f6f7c5e7b2a4951e3a3a19fa2e1d1dbd9033ff5d3e25171183ef32619fd7dd128786417d2476b5ab5413ba993884 SHA512 3d03030fb03a3671d013003535334bce20eb64767966e168d17adca029ce9717e59b40c711b36ca5041244a2c0e66668e0ef51f9930f33b8fa1ec7e1581872e0
-DIST genpatches-4.14-109.experimental.tar.xz 5228 BLAKE2B 0997d9d6ed798ddf6c9d33fdaaf1e3039ca1661ab1fea8362e0a34adbdc28d3f945b5efcf40e92c0b8e5509b400459ee6a6348214fb55f195591d32ba5d6a60f SHA512 88ba59ae334ffd4b9a79fa7647d8670ce608ddc5a8d591721ec1f0d0204b716c458f8f435a2623ae4e00b25e6869f201a1890dc365fc19a86187eb6688cdd620
-DIST genpatches-4.14-109.extras.tar.xz 17496 BLAKE2B 8d2b639e9428b81ff568c89c716853c0bea6e5521bc7c8fcfe21bd6b635811fdb31eb1e6647fb1da6f3f6e725ef344dd2bd735615ec39f4ea548ed5559d50726 SHA512 35d95931653d4079c6e6062268bd1671d228b890d280a9bcd0cecf637eeab93abde7f4d188b6bde3da7c251ad57dd11fe24aac2efebc26d8e8a3d9e22d639157
-DIST genpatches-4.14-110.base.tar.xz 2517364 BLAKE2B eabac1b37f5386adc6fd40d3287d2e973e7f02cb05bbfb5c806dd1e969867db2fcc65e1921ad1949d0c58cd1b59867f6211d170ed40e64f627c957e9affed47f SHA512 b42abd868785a8b7b9eb90bbc95b94fed1094fb9cf7a12694c7b9e2caa6bb35b25f7602762470688c527905c6317ac090564c73b3e3d15d1b805c5a60eb46d8c
-DIST genpatches-4.14-110.experimental.tar.xz 5220 BLAKE2B 7a589541eae5b18d9691ff98304b08aec569098786d00343738a9ef6338ab5191e2a198ad6e13225af84d2da9434e0a9bfa086e84402cbcff95b4f8cd71d2bd4 SHA512 654b31d75fee5170b3a2eab88b6e8a5dece4b232cb40701ed7885e4d93666f1bab5b0af5dbde6d6372a50e50f12dadbc58d6202b1eaf2c1b21af048a7de66889
-DIST genpatches-4.14-110.extras.tar.xz 17492 BLAKE2B 4cd012429e320af35ba39b14d8cd27168dedadd0bf6ec0973829c15a591df6f0af282c4ca34691058bd2ac7da2a59e8d6c2480068f764d6eb953f72071719074 SHA512 31649bbb169458ef195ace8b13d727de105e1c8fad01bf71d411c43f904987161ff048e7847135df30a26645a9600ca4a5d9e4ab5dd9395acec66e3a5f6d5a0c
-DIST genpatches-4.14-111.base.tar.xz 2528204 BLAKE2B b0d4e6c6da40bd133f7028974b38e8a9f8050b19ecf99d1b81d85bab061e2af5d041ccec0404d2d1d3c9ced9bf93dae22e9800b8c08fbf408777e07ff4d5030b SHA512 869a9ce38135e62b00fa9e061e344dfefc4c5631d1639dd9389ca8d69d229255b7c755215155ce9dbae0ef8e5a8221db147a81a5bb750b3f023b1a884282510c
-DIST genpatches-4.14-111.experimental.tar.xz 5228 BLAKE2B 1b6accce36414defb71623ca7284695f007a4ea6dd9092064b3bd33e0e1be42ed6e68b7b22502a6001e977e462f89df3e3944a73cd8ab4659a89b7f17774bff9 SHA512 d0c6864cdb1a1e598003ad81686209e78c5f4af007cb6d8d693352cc5e8840190004a1fdc9592536322dee3bc64f02552c34dce6a8c6cae0b714935fa15d3a8e
-DIST genpatches-4.14-111.extras.tar.xz 17492 BLAKE2B 1617e49df2dde463f2c9efa02746e1580edc55b5ab37712c1aaf042249e691afea692dbe26863aba233f35e91046239cb6c635246aabdfce382aa74733cc6286 SHA512 7c1f261317fd12f97e3b7ee243adb9803142f5ede61379dffbb6c24c7732b085c7eb2a196e8b5a6cd05d5335c59ecb161e50690545dfc11aff85780cac5cfe9c
 DIST genpatches-4.14-112.base.tar.xz 2529132 BLAKE2B 3eb9bf10b1e11d43727b11038a0b19060bc54e5591b0cb8c5ba50f223aadf333e772e5e50c1ea7b2d26a65adee0af7da9919de8e4df20845123c7e3dceae8eef SHA512 650b34baea4910ce144b72df0fa7991f90cf60614e70c34bb5c2d939e5d70d4535a8487407b9a75c615d3629bdbb423f96022f2e8a28261b9bd2b99b7a9bc541
 DIST genpatches-4.14-112.experimental.tar.xz 5220 BLAKE2B 26bfc7e99e843aab354eb176bb6b2420cb19404608ae20b647e658a4b37938a2aca99fdfe63a02c9d998be5afd899bb6672d9704962548e04d0efa4dbdcd77a2 SHA512 c676d9086f67e903ac9fb9af40489460ecf245ad7c4d5636ea2ba06bc1558a3aae35ee76026dc1aa3394080ff8390b38cc764ff663829deacd9b5b0cdb18e38b
 DIST genpatches-4.14-112.extras.tar.xz 17492 BLAKE2B cd6ce9e9541db874ddaac70afbd093045cc1c00fd5cc40426779f977facd4d2484659aa5afcc728015884de5a5e63f93ad6fda870e004992cc7cfd1d6ce008fd SHA512 93b828d96414f0bffc1e773d1fbabe5bbf17d58850a3e86d8e02005b6970afc71e6647e341ccf596b1c9f5ae6f38a0f3a187f1b316c4cbd089f691a9209ab5ad
-DIST genpatches-4.14-113.base.tar.xz 2558384 BLAKE2B 9a33a9b86e40c9c4734eb12ab56483fac811265e26a2618ead4da2d1204363b8429a8b9d4d2284e777c0829bf627d45833425d3c7612bfdc7ae98680eaf9041c SHA512 41536bfe41fcf4e930990d81b79e2c688ef806d7b20da3fa56244578a233449f76dfd489c2baa4d5f626fab9d782c27f1cd6f7a80e35c8708030201e29ffc53d
-DIST genpatches-4.14-113.experimental.tar.xz 5224 BLAKE2B 66e5f9fa5e46c64facbab20c7b38a15c15c3eeda5b1c64ae1dc84a3031f6f496bcc5764cdab5b99b6cfcc074fc9328492feb6145220b9000bfb42283a6118cdf SHA512 745c4e950576e1cf8d754dc59c6357b0dd67e9d4b119c66d8a73e1f5d09cb0d94a1a79dc8eb981ca9ae26b7ae86837a942d51477e728d1ceeb95b6a7915ec532
-DIST genpatches-4.14-113.extras.tar.xz 17500 BLAKE2B afa29c0d2c4beb73acaa6e5e681ec446caa3ebde8e4b15dfdc884be8dc5db3c27e3c3665c91c4fb7265611a61eabbcde917c945efb86e5bbc0c400024d4f43a2 SHA512 065e6a68bc073a50fed158b1da591f136a32e3434d8e0f2cb47ea6ce318b20e07a483306520a8433e65109ba5cab4ee495f6bf15813242a7b3bdaecb9620ab12
-DIST genpatches-4.14-114.base.tar.xz 2564040 BLAKE2B c6c59dca8130f8172cdb02c1a28e833cae6b15a72be492a104f312943632b254a06c62b3e64c26cc314970c3fd12d6a412ba58952458968fd13d51ea6d5e950e SHA512 6c183938202c4dca29928836d5b08c12bf83dfdc95bfb4922be296dea831eefa923c8ec154a9b2b2f1b21289a265093dfb6e95ece6721fbed6d9ad91c607c8c5
-DIST genpatches-4.14-114.experimental.tar.xz 5224 BLAKE2B bed025708f4778762be4ffc0601dc5a9064805bfb88f6e9595f3837bd3d80a060cd2602059754b52fa5db4660d9db29d21a0a8050d1b161aff980c47993a1afd SHA512 29b63b4be8449f8091d759b5c95e4688d2dcecd91fdd9daa060fba6ae1239dc5fe2cbf2cc1e56e8b945a821569d15af933a0d5ae89721783f76ccd19f4203db5
-DIST genpatches-4.14-114.extras.tar.xz 17492 BLAKE2B a51727e175b98e9e0ebcca1bbfd272bae4409cdc0af26d8e7ed89ff8ebb03fa5ec7fecea98c0017d5bd5cacf273abe7854f3fb7bc6ba48c16dfc3f6531576b83 SHA512 d74ada6c0e821e510d9aea458d5a8991af262eff69b8a715b7303b2996248c3c060fd46101f1e5f7bfb5c99b4e3d5b3c50b3f3b289729dc4d335e3af2305afbf
-DIST genpatches-4.14-116.base.tar.xz 2610492 BLAKE2B 6ced38b6ff2ba5b8043ccf43d4cd3f6d40e0821d6c79b637f51f9f47b0787ab90f11b3a50539e8b095680cb9e460d9e034af4dd0439d207bc5a1ae51daac70c2 SHA512 0dc5594067e5ff07d379fee1bd6b4e93ef5a9ff0a8f03e8a51d984f24ca4c46ba4b9345bd2f013b13cbf845c5964a212071504aa151aeef13b9bd8a3966c8791
-DIST genpatches-4.14-116.experimental.tar.xz 5220 BLAKE2B 09d1bf05cb3a6fd80f581ba18eb1c3dade96f70127bc6bbbb54b11415ecb2a5dce67e9d7d31eae0c14b598d6aec971736425d82466f520eed262b7bb6b83f831 SHA512 dce3b6c77c3fc817c4582bfcc30ad1a239bbe34165b7156ab19b210ee66caf160dde49015e6cab3241b9d9a951fbcede02c84aeb1493b8a2a6703f1d39c9695b
-DIST genpatches-4.14-116.extras.tar.xz 17496 BLAKE2B 7ae4a3648381e8dd2ecf56c1d64464142d1e5e305be8615b2bf823710a8d41ea06fc36989662151f21e681ea56eae0cd815691a69031850b17e2ed9418a9e8b1 SHA512 1c34b3b90920712ca16a8334691fde1ca315f1a6c61dd84cd76017309c673e62103e308916f01bfa9a573d1ff74a7ed97892f3d7cb513556d8ae4f3c391c6fd1
 DIST genpatches-4.14-117.base.tar.xz 2619864 BLAKE2B a904c1fa1c586114cc56020c8fe41b430d5ebe77e0130c3d701eb78488432d0df3acd306b986c870bbf586ff5f2a1485f4863c5f7d93f83984cd85644f486683 SHA512 7d5b703f90e9ca6588c69886780a79ef86606b6fff332113f9c2a2f97fab3cebd1a63c0f86f4ca1affb78c784f4da634a5e3cb458d2469dc14bf23ad9f6c74c9
 DIST genpatches-4.14-117.experimental.tar.xz 5224 BLAKE2B 72237f3f04b334c8982c6bb5dbf5621e8e30dc19d25203cb58cca409c655ccc7ce204b71f7e3e0ee24d8273f88fb2bcb0eb17d17757ab5a2b328179f2dd9a6c3 SHA512 8d6115168d871fa092b69316691254784da1973cdffbc0ef40b41da116159854c4746f2b297b9d2b616277d5011992b2dc31647927f4b71d0179c62f0479d5a1
 DIST genpatches-4.14-117.extras.tar.xz 17496 BLAKE2B 9eb4eab77b148c8cb05b770c3e2ecd01bd9045a2e2d5e54b9c02944f79b21c180ad12e5565ba093f6eeaa899d3a6b3b1703738371ac92225b841177c64b5e512 SHA512 ed9e7419367488508120a95509a327c19f07daabdeba9ac9afc25de1649bb6ce588b143013dfc54e56399bf418357e755f689c049519906424efe97cd0a30c7f
@@ -37,18 +19,6 @@ DIST genpatches-4.19-23.extras.tar.xz 17484 BLAKE2B 2ca6355134f9d84b5c564185244e
 DIST genpatches-4.19-28.base.tar.xz 809620 BLAKE2B 2bf07264d3d65e7908b27727bbfb295c53a0cb2c8a9358bb41fa75a04b3094b0a9ca68721a440f6ffcbee3420b5cd31211f5e1673f8fe8043fdb5d913efe312a SHA512 00c9225dd966e02cba66b039e6bead431162d13b64c3a1680fd5c8b2f1f12af86bcb3c0bb553e88bdc12b4675d99be5944f280a5fad7fbf59e8bc6ab6d041ec8
 DIST genpatches-4.19-28.experimental.tar.xz 5804 BLAKE2B 6c4a52ce04f35a0c971ef438f32acec66395b763f725176312d4ea7e7467e9b2bab953afb64df744acc0827bb96cb13f2537427a56cee10dc95227300bfb6b02 SHA512 e04c94dd53325e89f25343999da5b66f4624605d66859884f2768c073b203126f7aad5fb5a1012fc56a4e2906fb2f3a3f8fda48d8e300a1a0bb8dc7c1719fa82
 DIST genpatches-4.19-28.extras.tar.xz 17480 BLAKE2B 599e85a011c87a7a9bcec44579fd4e54ff9ab78a4b8ee727f6b741acea29902c0531988d5abc6ff9512a205601363837639b5ba31190a044009bac13cb44067b SHA512 e201383a2fd00d063bd3d9817fbc40052db19e46db105ddb15dfd1dd90001a11de12495372f2225adcc80b620252ea20d49e73da46b8b3c88e62baa71a71a8c5
-DIST genpatches-4.19-29.base.tar.xz 826944 BLAKE2B 1f57f7da0dc2d9abf396d132d6639329e5d7e82d205b17a7be66ac39f77ec93fe3e180fad4f4b1d2e4be43b5ca966e4f40f5ef50bd593fdb55fb229c6c371f85 SHA512 1aa384f441753da8e035a9f0c103e0613997fcd6a5164498b8890c4125d42e8ba3e2513f4a2a8de341fc3027aef5884e274763773d9707dbad9a6ee6aaddda0b
-DIST genpatches-4.19-29.experimental.tar.xz 5804 BLAKE2B 13798da860cef4720bab25480eff50079d5161fec2555277154574f1d86b0fa04980e666537fdfc0eac762946e28f594cd55b71b7149f789cb74b65458ff3af5 SHA512 81f3736a60581b1ad920caca4f38bcf94be9a776f8af08b280812810139d3d0ac9281831d6db70fdba0eac90acf4bba67191062efd84ca832ea17544d34a1bf5
-DIST genpatches-4.19-29.extras.tar.xz 17484 BLAKE2B 7c2b7a04f1a63433dc44a9d38aacea122c6eb5711ebb0a2535493ffb862252ab9520b74f2abc34e36a2bc6eef3ad97a5fab1dbdbdcd9452700e8a322b73bdbbd SHA512 699f6b8f0abc62f09fa7b66c13bd4884ce1c537e3c5eefb67ee04e4c47e3c8bd8e71355a00b66787caabba4cfeed10e9e99c37a5b72c33eff0678dad8eed59d0
-DIST genpatches-4.19-30.base.tar.xz 867128 BLAKE2B 2643d8f494f9d9ccacd6e7b755fdb20268c43961ce99de3f52bb80b4dcbeb1ca93ed80a0d722ea2f9a7879d218bb15c3aaff6ceed17f845bf9d210799d42c132 SHA512 5598d5bc77aa321219f87c7adb866c0c01d7e87765419a6a3a1ac882881fa7d59df5cbe553e5396481fa909df8a44ee1190f26a9ab50be7882c96677a98d9c12
-DIST genpatches-4.19-30.experimental.tar.xz 5812 BLAKE2B c3646be2f555837c957b39b87d3f7c5693fc51d3964d6b1531d44319a890e9d818928e23cc586a0c983625dfc98b0b1be819a550f0f5d64e9eff1394802ecdb3 SHA512 79512774d3d2f5200fe33e92c77a23e5d1cf6cc1e16642b9a3ad9b84720ac1cf8d0dae6d6f633d58e1abddc04bda1d6688a507932003158bebc77f5fb963b8e6
-DIST genpatches-4.19-30.extras.tar.xz 17488 BLAKE2B cc7ac0264801ace3e52760ad7087af8b9ec8e05975750c55d4a9e65ad92e82f520af373e582491684d6443ec11e4146cb92b99c26f078f7defd335adab7ee476 SHA512 df8afbec790f72eda8eafd9badc9e93b18ec3a25c1b99d9479ab6671a80bc4b5c3eeb3d1b4daf5a600e878545e9a98f499f5553306b944645a70d5186cbbab30
-DIST genpatches-4.19-31.base.tar.xz 879032 BLAKE2B fabdcf0656d1bbc4348a2b87670e4e1e0bab252af75fc40ce8c82f4afc0acc74458bdeb364570515f9f9b81741425ef37d51dead1bea98265886f08c8dd76f56 SHA512 f7234e3b465f02ca636552de497c2b319f62a7b0559e35d319582f6bfba903c64353b11253b76e3557017bc2275ee46c857e5e59336adc2f7d9c8d63b930a38e
-DIST genpatches-4.19-31.experimental.tar.xz 5808 BLAKE2B f8e3fbccc8d071fdea1a01a4f52621e10130ae9ccba7df627c2accdfff481aae58b35d088944ccf26c60efe17f9a248ba01e998332387390c031e804ade0c4d2 SHA512 c857fcbc60fb85bdf29a1342e169dbda342d1c09bced161ed1409fb9d51c85db8436564a77d6694d6b9e1a294a61c6c87c264c40c935de1a38232bdafaf3a16f
-DIST genpatches-4.19-31.extras.tar.xz 17484 BLAKE2B 5484a4cbea460706fc26c298595bf099ffae8b570ffd37f29effe0829a06b9e87b24ab991db60dbe8dae622c9217605054625d0324c1710b27bf4ba200ee7464 SHA512 9acd7a806fe0e9ebd9a046d9fd6b3c82c57b07102bb743a345da1201f21e38b7c450f4cdbc68b3a39b86280ecc9848b99d844cc984b008b5dcf3df31b5d039e6
-DIST genpatches-4.19-32.base.tar.xz 953836 BLAKE2B 80d20e2402fed9452a0fe4d4e3062a05e637181590ac5890982ea9bbb3d0b1fc7f3661aec5ada09463dc7471063e6e96abe8d047a080c09c3f2762d77c5a63d6 SHA512 29c07d2c73947aacdf102e76117451a1edce30471cafb9b89a11e5d6952558c24e0b526ecbab908ad228a2a1e95d6ed0ffcd1f099980dc0775a54a387d1fa89b
-DIST genpatches-4.19-32.experimental.tar.xz 5808 BLAKE2B cd4e36b9772556d868989a50aec19f48d8198400e9b113fe32691728ebe4d6599c1dbd02486d5f47e15a9cac0c17b4abaffba994e837b4a8320a120e3397c1cc SHA512 ede86f76e40614ae612e646ceeb84600b23a0937854cda84d3418bca0a53f9d4d5cd280904287d2b39eb246dd0a3b324b1e742094a158ebaed524d266944488b
-DIST genpatches-4.19-32.extras.tar.xz 17492 BLAKE2B acbcff62c52c6840dfdc1edbc882ee1394d505fe8fc71d92f2c26fbc77db28f410f2647e9d0bb3192dad8df1f47f65ce634125427b17c3724b44733d4f06f402 SHA512 50e1de0036de1d73527c2fe0addb06b23dde41f5237118ba1bd4f68cc039477594b4333031c948e1b3483b2523be15ae8ea57a60862a7f9128046b62f1fb8759
 DIST genpatches-4.19-33.base.tar.xz 964976 BLAKE2B 1b92bfd63eb8a89180d2b0f930197a5007447f2bc497a46ca5a5cf5e2421b8e79b305fd9c5b0526ab7a932cce8b53e43562859df281bfd112ee927cc07406cc3 SHA512 3181730fab9a7849acf297459f3335334e8d7c679bb68a787fe3e7e6a6ff85edfb138e0fcfa644010104199ae96f95a29801a79a4598fc33087084da4e315c4a
 DIST genpatches-4.19-33.experimental.tar.xz 5812 BLAKE2B 4ee70734a7abb34d975cca458ef7e8ed41382d13ec40c2c224ea93cfb593b6949bca889ef89ce74de0abd3d959f106e3990f94dd5de6a6b33191e3ec2c3bbaa2 SHA512 f083d817746bc5893581e3f4122705ef73692d81cc235a8d7443883bd862f61ada07e45368f541959357c94ebb9348e0c76f81d9425602f7c1a0cca3cc111d9b
 DIST genpatches-4.19-33.extras.tar.xz 17480 BLAKE2B 4302ef29bc7d39f00834f88aba22f27ee79af42320b732058002517cc3febbb54cc8e8040c466e8ccf324a83f7eb0ac3e44ca0eb5135c06651bfc26f9cdb445d SHA512 85aa79dc2e2424b4d0113b48f4bd06b624160b24880db0fcd430ecdc74d6771aa8157b658456e6ea93d117d4f7598ca217d513ce82bd6a8f7de690bcece08d5a
@@ -82,42 +52,15 @@ DIST genpatches-4.9-143.extras.tar.xz 17348 BLAKE2B cf56d86e29ca96eb16a0c03471e1
 DIST genpatches-4.9-160.base.tar.xz 2848244 BLAKE2B d9c91bf38e0cb1d2169a98d3100ba586e7f8f4cced927d356bc1f7754a12bdb80e698b7cc1d1caad488287aea6ff483443ec358be2fc0d919b674c91e7b45924 SHA512 40cf167d043dd5c1114677478b23be280e3c0c58d3e68900079853e029de5759c24bd43647c63ba394a4206557b42c1211bc3f867c0f6fc33315785248c2bc0b
 DIST genpatches-4.9-160.experimental.tar.xz 106380 BLAKE2B b62edc34f952c43ef35c3b3bc2055a9355e88b0730dc009c65f2d7af13bb49693e1616858f9b55bdf173e4a8d51567747fcea297d5380826ac2616870fc3c3c2 SHA512 295d65765291e8af4ba2895fd6a16496c5f3b568da3d1ab79c5a48b9883941395ac3623925bdd2c18224d816f1514f1ee98b7943a523fc4f6b844542c2950d0e
 DIST genpatches-4.9-160.extras.tar.xz 17360 BLAKE2B 197432e244696371e073b2067fc569ad043aba6e9fa661b1732d5640977ed24a04ceb45483a76fe92e92dea488fc83835f96f014b9be4f77a36c7a01f3b5884e SHA512 1eae9de145782b60021a98217de97da710bba660140f30f6f5cf5ffe81ec5471c6ea21e7ea181e6393a69704b9ab94bd1dc60fb7360e3935f85bf48ea0463c7b
-DIST genpatches-4.9-162.base.tar.xz 2866160 BLAKE2B ec65c7bd8ad996922ca646bfac467a49a8b120ffdc8d42d51b5daaff04ce430a1034015c19b393dd607273cd61b63ae032eb6d1a36a41fa277b8ac081001d6aa SHA512 d88df26e9cca88509d84d9a6ff6c7d391c12a0e4cd76cfa8ccf01026af6a8ace04312c773223c886be88b363df214691567d36115f597622547f09a993653584
-DIST genpatches-4.9-162.experimental.tar.xz 106392 BLAKE2B 3daca51b81b1bd9636d6fc44a9bc36264e648ff70ba7690a57dc3380a06968797fc72e5807ae3a9621b53b441d76d75218d536967752baf269b8e2e707642e13 SHA512 13fcaddd0f87a22e5f935a377d7c89a03943378631be7057e225df02be33d47b619a8f262395fd62f0cf855eaaf381d8baecd58a76c2992c24ff11b7b5c6957d
-DIST genpatches-4.9-162.extras.tar.xz 17364 BLAKE2B e533d76bfae15319b027c92e36871ce1a49c2bed44f383c579b8477b0d1ebc976556889457b318f70e2705f012a7b4cac728acfade93644ede99f93c278cd276 SHA512 0b37c079552332feb436d12246c54b8c7ff368ca6942d13ed8047cae8067d500e7a08beec54f68c0eddca44f3430ed2ed45314ac270d9ab1087ea8a999ef97d7
-DIST genpatches-4.9-163.base.tar.xz 2882216 BLAKE2B 939884effc2212550e41049508beeba1bbd4204befb2de8ded8f441a92898586493a671e5bebb2477b3ed48ea5bce9fc3c6b54df24cad4fa4d92a5ecde45b586 SHA512 b923831e018eee802ee1481d3b1c4c8a247e2749151a81c5e87988a56be2cfa15cc80a1d18fc9da4391f29af4bc78aef1afbd692f5dd269760764be98ff51fb6
-DIST genpatches-4.9-163.experimental.tar.xz 106348 BLAKE2B 053496a8ca1601a75b3b1f3fe8b380ac50263ccb933a5c379a959730d4567034ca0444e11b9cac458a5377d178af12247addceb613264be33a63bb40c98d43eb SHA512 f4ca78bf098e645763e3a2abda69968367c1b80aab6eead7fb6abc78a11bd243ba62b5fbb0185461261c1c9602ef751ba9d93453f2bc47bc095e22e1d3ca0f85
-DIST genpatches-4.9-163.extras.tar.xz 17360 BLAKE2B b971a54964511e11486b17cca77e47cf178832d1e36c67efdc43aea739ef71676bea122c56c95d3a211920108269f90e9eef0600a893c8346642ee0de82c99e2 SHA512 75118d17a3ba805ef38579c89ca1a9ca73cd5647b389c854b4a3784c0748d618a4e545cebd78bcd43c90f4750794a953d1c543a7a8d160720d625b29b3460cbe
-DIST genpatches-4.9-164.base.tar.xz 2887448 BLAKE2B 867abe551ea4fa403279d9a62acf7c4d6c33487a3795e3725da3801f1748667ff9aa5a513de26fd5151799fcf8efb0f3b262f9f72bbca5bf0ceaa387e19f3a2f SHA512 3141d0d440014256e356acc27014a45fb5ea670d67b2ccfd99fb86b1eb7466e2df529569a206c138de0c94f10e0c57ccba6c85f3e097513b25e41f600ca1de8c
-DIST genpatches-4.9-164.experimental.tar.xz 106396 BLAKE2B 915865c9822f99e22ae908264dc56f66cdebd694d08374e7b2fa03f6098aea5b204e2f6e1272517802b3edc58fc190bcbe3b976ca173659b74502ea53c9e9d3d SHA512 7f13edd9b5dbac0e3777aeb1b457f737331d01ebca58953262a801b148ceca7b9d063b72dcca3342a109dd4d1210285df0b05547059544fa9b893461497b62db
-DIST genpatches-4.9-164.extras.tar.xz 17364 BLAKE2B 7fc1e9fde3939f28f8069c50f102880156dd0e50fa0a78bc21595d8b25bb99b655c5e2bd501717abf4dfe15949649ac6229fa0abd184a562d03986b9e53957ff SHA512 445d748246fb30dd5a29dd7118bcca567dc4c08659d5112b358919eaabb145ff67a99af33c65053824e018e379f9357d12f69e9bd55f47ae79dc1351c4dd1bf1
 DIST genpatches-4.9-165.base.tar.xz 2888744 BLAKE2B 160e88ffcf9493dcb0904df037964860a0b4cb711476ec27ed4655fd53af086f4f4a964d625f31fb178ea87e2d04ce1a24c67146051ef08104f546622e17e0a0 SHA512 9be468cc40c98c90d577f8bafb034e0fb5a55db050b1fab8f20256587b586f6e96ee884762521befcea64a0701be5c032b84a64809401fe4583785451e6ca676
 DIST genpatches-4.9-165.experimental.tar.xz 106416 BLAKE2B e7999f76d53f734e62872570c8a876fc81bf804b5929de5a4b7120c576a44775a2e52dfb0def54ff59ada1e15d759940f78c036c06c9414e1493068a1cc40a68 SHA512 90f52a2240ceaf5036e70f7bedce1e918ddabb598dd463d680dab238581985cda6c39b17fd437e5917ba1395bdb6af5d5a4546f6161684e6de61ca89dbd4e9ad
 DIST genpatches-4.9-165.extras.tar.xz 17364 BLAKE2B 6ef1de46794e1736197c39cc428954278945273230f812431ff3c58b90f2fed0a9660a73ee09b5b71087c5a296c311c1a56c5b929311e6b2b66ef63a97f41208 SHA512 8036b93cb510a25ad9b4226949dbdad2cb566fe1d15064cb9112453dab69b6ca3f5e465f97efd94c425f9cbc177c3cf251c7220b8468f8ee1d6141d48047fd84
-DIST genpatches-4.9-166.base.tar.xz 2910296 BLAKE2B 478bacd2504aac8ceb378a4810dfac62967638acd3a23dec97b1ff67b369435768e9a1181ebe3b08d51266aaa8c2498e6a6ca35980fe6ca8964339e6e97d3f9a SHA512 58e0c6f23fccb4f1e9ae27878030efb4a2d4b38e19ccf7406067e5cd7bcc33206ee4303907108e20e0cf08900c045036ab991769e92ed749c1d46a1869db6b37
-DIST genpatches-4.9-166.experimental.tar.xz 106416 BLAKE2B e7c119fa3ba46e42221d255146ce920aa095edae1e3704f974bc17f55e606b3e1a70cd706a3930a7b61d9311ce759e2ef7bb35b406a94bd3d577af930da2fbad SHA512 26cf80cfb09c05ba74f8cc99f7adee24049e7b33c62977047a65a97e6a37b444027e3fde6d551c82465d0b5f60bc29e9167826432883269701277dfb597f9113
-DIST genpatches-4.9-166.extras.tar.xz 17364 BLAKE2B fbf9e63348d5c3030d3544bb0a0e397b1a542a7cc26226bdd2d754b804d51aabb7ff3e24d2fc371b75fe15dbb783988be0f678d66a839f4ccb272adabffae296 SHA512 4802d8f75dc6215b529dcdfb41cd3a708a0a041977a48f82234fbf41331cf501f31d26e106f01c41636e4c8ade538dc7ea87a51dd946ef18aa00a23338b1f434
-DIST genpatches-4.9-167.base.tar.xz 2916288 BLAKE2B 3960b6e7a359038266f879a1fff234efaaad4ace0691aaf432923b4f15b9d13f389ad6db0256fb9c9ee5605be50e7aed1d761ab747ee786f219dd9628674e50e SHA512 7b2b6136daad899fd79c720b15df4ef85265088f2cccd403f861758f92c48a4aee1dd3789b1e08b0af0504456de7182a33cddbbdb2bef0dcfc12713d44289c90
-DIST genpatches-4.9-167.experimental.tar.xz 106424 BLAKE2B 26d0c4baa18f9e462f58299309f61ceee5ca13e07078327ead2c9cfe16b64d52bf0e194fad1748f24930d21fca1b7029f8d37e22006cff33a50826cd7b4b8eb8 SHA512 1a11a4ac1374eb8ec97e12418d85c2f76b9171c23d59954764d0ccb00bf11f03288bc09b2c78d9dc98543807cbc6a3fc8d61d2b106cd8a61c655085fed9883e8
-DIST genpatches-4.9-167.extras.tar.xz 17360 BLAKE2B da9dd1749fa96619ebfc07974b59effa7f56a1439a52e7c119c231aa86508ea34692321fbe3e24106e28a5cae4483162915019299bd1a42b84e48602c31b5b9c SHA512 3637ea9a7e4871641bd837091ac58255a68257924b7df876ebd951e710089b5558934ff7e4dfc281ecaf515157a54b7767dbf4fc6a60580ce11c4faee7b829a5
-DIST genpatches-4.9-169.base.tar.xz 2938652 BLAKE2B 076c66deff946d94b0d0ba37f977f89617aecc4f45cb011556d708655cdd68f5cbdc5b312e5ea8f63e43751656d09ffbb1076619d5ef900b1ff18ae0ebc69f6b SHA512 1f355730a556e0bdac17104a7c394c3b27a7d036b3debd21fd3c9311ee3f1a08db9cfe8553f461d6a9166d598b36693894cbb76df81bcbfc6c9d3dc9883e3a0e
-DIST genpatches-4.9-169.experimental.tar.xz 106376 BLAKE2B 4291aa71c72550c33618cbcf48341966778913f45dea4470653ab61544619d560bf0d7ff9eb65f4a1a4037ab14c28cdc8566035a260a34d4549e1ac176c06ab6 SHA512 7f465c0316a180fc49990fd929d4defe7957e8160d86d966260ad26647e832ebbb80740aa4bb6ecdf6e2b8850ab986b3ecb4d9362962303fbb3c25b13af16309
-DIST genpatches-4.9-169.extras.tar.xz 17360 BLAKE2B d7c8209777253cbe524934542f95934a3cb1790171e9a3537e141ef5046e382942459c0b11b4f66db9c0afd480c73e37c64f185e6b533ba1185af62e6044ca5a SHA512 6f2b71aab3e2330ac47e8309cb3711a4cb2b9972287ac81c903ece63ceb1cf75878009ea2da6a1ceb65d94077cd1d725de69d9c2caa98f2f7f141d74a1b9aebd
 DIST genpatches-4.9-170.base.tar.xz 2943732 BLAKE2B eaf1e095f2bed3c294a5d5afdd8fa618b0cdf79c75737374bc9bca059fcbfe5de0e3be470555caed783734d6c498a994f8d61315dcce0c02c99b66e078ffd4a1 SHA512 c643de5a9715f79bc0484908909032a85cf2bca6fc0cfac91f8ba4fb128e74a0b61d70364227889e51e5601e54a62fc1fc5df154dd0315099ce68613c8f4b814
 DIST genpatches-4.9-170.experimental.tar.xz 106388 BLAKE2B 4417a099c0201dd05fab41c64171f840b3328bc4b416ae49bf9723b0854c29fc7d748e660e2b674dd83cfecc9a6860e085c75e57e6b27ed9007ebb8b70031f83 SHA512 f43cb573159c95080085f6665a6af9649a570f8c382a76e7347dd68ceb6cbc4f7671be65fdeda98fedce19fd47bfab07ce93798ffbb1d5ac6094ade082e827fb
 DIST genpatches-4.9-170.extras.tar.xz 17364 BLAKE2B 02e4b4df4777673b364442ec3b1d106f22e6d59d339a9ccdf56fcc0f73d3148daa3c28599c4042bdf1ee04af05856cb4a1969a83dd0b98388da8e600143b04f8 SHA512 101af13c6c6d79a18a0970dedd622045c0261caa6be3c000141837f5caf9d4d6b2731c1932cc2cdf8bffe1de051c808e12ff9ce9da25040bb8811e34a4eb4910
 DIST genpatches-4.9-171.base.tar.xz 2955076 BLAKE2B 416626a352c16899bdc020301e8876b7e80e70181ec9c56a5d6f4790bdd0aa7fb76f4500027d7dcc1f6b134337563343fe49be472c6b5bfda05d98d5387abf1a SHA512 bfdcbf455b24ecb1a8cd5f54da45b80ad7f138cec31bf24cd3dd35d7b06f6899e760e80c1bd3ae08118abe67067f656335a76e69778c678b0b21f27a6a712a5d
 DIST genpatches-4.9-171.experimental.tar.xz 106352 BLAKE2B 1e54dc5d2bbd64ac3d82ba2018a23f9d10abbe171cb111c0f00fe7b2f04926309d86e66e7604ccd2bc3cf1ca264efaf20da3b6fc25b77888a14d99fc55a82b0c SHA512 34afc0e3521e8d92949bfd3679402b135e7b53223fdfda56d813a42423359ff08d7ac6fc5d33115d2bbc3ef86afa6df5020cfb584de0a0f761600f45702b3df8
 DIST genpatches-4.9-171.extras.tar.xz 17360 BLAKE2B f7375ffae32d7a54e1f6522524acd23344f37ad0b152d4b2a178354a1b5aa232f3cc2ce3e3f5403ee09c49e3b59bbf8d9d43493c907b9bb38aac5df33dde90cd SHA512 0eb30ef762a4f03a0a48638193cf5b5fadb593fb289bb3b991d08d58a8558fd0dc337e8c59cacef7fc49317aa64a3e3da0fe3683a06761aae58238ce88731c2b
-DIST genpatches-5.0-1.base.tar.xz 3968 BLAKE2B a8c05208ded80333ce545ee2ed2f50b79702f782337042bf76072cce18ac8c8330ffa760dec2d3c68cf5584aafb15abf610c63a659c9e68b35943773b5e37a51 SHA512 6a811079abf1c278e7d7bd2ef2becc735bfc9c05ce973068554e373b2ef6e922b3d779accc59393fe50e76e95d4b5ce9ddd32cab687d156376ca999b93048df3
-DIST genpatches-5.0-1.experimental.tar.xz 5804 BLAKE2B 56326e211c003cf1c9b772af198f928528e0efa1261759e030ad369cea4e44cc7fdb7f07975245268b10bc7e23240e1b9bc58ff062696d53faba64ea66ee57ff SHA512 ddbca26e58a0f35954ea2d3bb24d0daafa17a5d93af537123a9549cf46d180845f31ab1292a836bc1060b8f0aa6d14d08c84f63b56476fef194af754489d9510
-DIST genpatches-5.0-1.extras.tar.xz 1724 BLAKE2B 348949e6e8def64d08ac7fd1f1cdbba6fadd6afe09aa7ffef25efe652284d66fb9b9e9c160ff9598bef8e94b28c1b866c99ca296f57428bf6cd40de03dd23f4d SHA512 7755d61797c466f2223be0bd20e54757e90ba175e3fd80886d86e4fd452a324dd42f2970a1878ddb3870dac4264b6c047ad9870d57f4478eff4a844a82ea9c66
-DIST genpatches-5.0-2.base.tar.xz 24252 BLAKE2B 1607f394709fe010a2e3184f75e54b0229f00712264a3346cb9cef488e5aa14b3e49e62894140710afd956317f4ad3842f210c06a9fa816cd18e96db39ad7526 SHA512 a1d5f8f2733a6e5f0ea624a7e8bec70c71a20c0ce540d71f08fa9fafefff3111c776c7ffc882fae1b66786dde1dc1ce57d6cf7e9e273a4b55d38d2cea7eaa2a0
-DIST genpatches-5.0-2.experimental.tar.xz 5808 BLAKE2B 2c0b5de0a48967d192085da6393ed8ef302ee0f96680d8f10b31d6e01706974d63f00d54f4c0b6fe4ba39d11c6dd874bb73252d879f89f32f305a7d30cdcd06f SHA512 9a4288a7380487989594bebb1bc95f2a074840acf8f734c45cd426903381664e10366a5e1126c0e05e01d23925fb634f5b4c6abee2e140aa9edaa7b20fde87b8
-DIST genpatches-5.0-2.extras.tar.xz 1724 BLAKE2B 61b36a94c7f1b4d82c856a38f278880ed4dbbead90650e04db52c4535961233f481550932cb0d51fbffd94e8cb737fbebceaae5b118a5e76ff9873b8847d89e4 SHA512 6c0fd49d740818cf35263b64392491774329aa3336437c442356589fb4f5565472c132aeb4ae3459beeffa5f183e8994ec88269f7ff2254058477f2b81357971
-DIST genpatches-5.0-3.base.tar.xz 34292 BLAKE2B e6ac48b519802739b54081502d7d4f1b80aa5988aa04ba206c52c5991b29cbdd39d13c8a8da7a876e9dafc7d9f33f90eb866cfae2f8e8a747a358661520c7643 SHA512 ea6c85157211b7ac7d448d6b9107f6bf3dec9d8c4e1509ef463d1f1beb661cffb16d24c1729037d37ef41335b4d0c88ab5467f0dca422e8591d4302e447ba0a0
-DIST genpatches-5.0-3.experimental.tar.xz 5800 BLAKE2B 5039b3847980ada995bbc811ed42080ceaeb024f01baf80bf020fd2915d79bd92f183a4cd6b73bc08de192f99930c225a139ad370bcfb5b0151695c256b7e1f8 SHA512 0a8ccd5b4232926e89755cff71eacc83ad5cea8922518c9dbe7049d866dd60c282d6c7f26df6b42b7d4678fdd369a5b15d775b8e948eb8ec844fba911a866deb
-DIST genpatches-5.0-3.extras.tar.xz 1724 BLAKE2B 21fd7595e03e7a97fdd1b06031a8404b6d4010db4bb404cb81cec99ebfca9e350990e3b10295b827fcd4b9354125ee0e1e12466ff278aab9a5dfc184e7f6db4f SHA512 993f46873596b2093d23305be2ab72b1121055a18049ec4e1c63f592daded68abb4724e7a51784858c7999bc114b3559fa3434cb148714f0decd64da80bfd700
 DIST genpatches-5.0-4.base.tar.xz 45932 BLAKE2B 28869fd86ebf9e6ceb2b7732c035cf7382a4c7950a1dabadb0c84f7101e252c7d74825fdbcd228e67e3f88370b1e0ce396e2ddcc4dd4a4f40b0e5e52b33a30a7 SHA512 71572fbb1fdc1b461d1a66fe134f00e5f7ccd0d6e805a8ca7e8d9ce32d1f195ac24d329839f5d24fa80de9b05866a67a71a3ae60959cb48b2267ef109b513923
 DIST genpatches-5.0-4.experimental.tar.xz 5804 BLAKE2B 6a69825e2830db123d74ae5579c2dc46987488dcdd33fe4fb8eed42ca48a300d6ee60371cd3103467381f4fce621d80e012f32e3640d44c737a9f9e72e777295 SHA512 0f6c8549213ec6499ecf8d29ada487d3d66fa8ec365bb1c3e47c33f39404749da422801309ee483c2ba388c8aec19ec3c99bc0e494ff873d16d2e5b4fa437d26
 DIST genpatches-5.0-4.extras.tar.xz 1724 BLAKE2B 7c2514e44bffdbccfa8c30d1d56bca2f38b9c39e39f6484a269124fa9404e16692333b57d0133432a796b3de51db27b886caae989bc9e6672bf99ca50e754a35 SHA512 052ef7189a30df3c691472d5525b93d6d35b274273c12450f59d423bfc8d3130d9f7fcd7e7f5ba3c633847555957bae419c06af2fd9b51c03958edd8951d3efb
@@ -127,6 +70,9 @@ DIST genpatches-5.0-5.extras.tar.xz 1720 BLAKE2B ae70f139c287092b5139a5e7dd509fc
 DIST genpatches-5.0-6.base.tar.xz 144128 BLAKE2B a34fca2447ec08d2918dc32c938f5219aca91c06c7b12acc9b8edca056b346dc86841af540897ee5ce1063a718d8d072d03b08c200cb8550275373a92c733666 SHA512 8684ca591d0b4afd1606592e5383bbf0c87979298d991c0dfaee04a2f14368bbc8d1aba4f604543a6c7607c4eedde21a560a1fb29d87af30877b7f83a4bfdc27
 DIST genpatches-5.0-6.experimental.tar.xz 5804 BLAKE2B d92515fff5a65a8d35f461df220989dc74a65b4142820a0bc70af3cfb2fbc85f42e28ca5b3ca61ae390b02f71427331fd3ea7c1b0704ade91f292f071986894c SHA512 a6a9a2745170ff36d127cded594dd8eebe832c9095db50c593cd359f2dc0b5add8e973918e77f86f5bc5a62eb3a0050707f86eb3f100336b4a1e6edacf6d2442
 DIST genpatches-5.0-6.extras.tar.xz 1724 BLAKE2B 29b17ac8ba5bf2f6b6e19e0f3055fc39ef816a29ec1d0b3390408ddb24354cfc62695fb893c2166a09a4250f9501ac75d82b3ff721e25eb2b3786669500c49a3 SHA512 d94218deca195ac6f3edd984d8c6b955479cc7fd352329a6e1cae08d715e4ffe45bf6fa27715b1f0ad8c6e340c0b584f89714943d3de719393f74d1eb4af1a43
+DIST genpatches-5.0-7.base.tar.xz 180188 BLAKE2B 9f82d953d7ee989e0259ee9f573e21d2b36c65972ea3742c24027c2a75e09e51d6f3e20aaadacb795c494c348fb07bf8c21338f4c9477da600443442257cfda8 SHA512 9e71a2e5fef7dc67b61ac45d76bd0724eed6117463448257be15d5c72820dfcfefe49b4829fb839af7d57791b47e00d5e6277fbdffcd90e4b39836f1f4162c32
+DIST genpatches-5.0-7.experimental.tar.xz 5808 BLAKE2B b362a1abab21c717b0d926dcc2f20766503b24ec000abde3dffd369d72052c0093baf47e236eaf652872370e6a907d04fc7658d34a3a3f0a1d6489da4ce9781e SHA512 68d3bd9f6ac15ce06e2cc8eaeb4d34b81052889d3175a93c1790d7cbf6ab6bf24bb47f92cc0f9b15fd41f4a2730615d985006cbea1a38980bb3df3837d0ca18e
+DIST genpatches-5.0-7.extras.tar.xz 1724 BLAKE2B 113a2b76c5f37507cf393e9f19a039418774c873ee26b2ff4f86ef24345bc19640d9580d3fdc22011725978d3ea7ca8dbc3bce2118b5618f3a1ced473f0e343a SHA512 71db77212ad8c4b2dbcc9adf88c1eaeb29fd14dcf614e1ce629c4133d51b78c1feda85f89595310842f5d1c075f95bef1f6f4ebed807d36250f60e5317529b33
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.103.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.103.ebuild
deleted file mode 100644
index 45ed2b24b9de..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.103.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="109"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.104.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.104.ebuild
deleted file mode 100644
index 49ad1b3f0405..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.104.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="110"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.105.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.105.ebuild
deleted file mode 100644
index dc8cdd27b7d8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="111"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.106.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.106.ebuild
deleted file mode 100644
index 29704fb5ab23..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="113"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.107.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.107.ebuild
deleted file mode 100644
index af2ef9472d9f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.107.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="114"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.108.ebuild
deleted file mode 100644
index 40d7424829d5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.108.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="116"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.28.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.28.ebuild
deleted file mode 100644
index 6e9e59455394..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.28.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="29"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.29.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.29.ebuild
deleted file mode 100644
index ec086aa5cce4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.29.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="30"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.30.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.30.ebuild
deleted file mode 100644
index 46e078f561fb..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="31"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.31.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.31.ebuild
deleted file mode 100644
index 757d6c75cc0c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.31.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="32"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.160.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.160.ebuild
deleted file mode 100644
index 4bd36cea5994..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.160.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="162"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.161.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.161.ebuild
deleted file mode 100644
index e18928f9292e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.161.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="163"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.162.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.162.ebuild
deleted file mode 100644
index c78ce22df9e1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.162.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="164"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.163.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.163.ebuild
deleted file mode 100644
index 1cebd063de7c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.163.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="166"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.164.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.164.ebuild
deleted file mode 100644
index a44e7710b482..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.164.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="167"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.165.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.165.ebuild
deleted file mode 100644
index 9f8cc9083183..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.165.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="169"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.0.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.1.ebuild
deleted file mode 100644
index 48674ed75d98..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="2"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.0.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.2.ebuild
deleted file mode 100644
index 97a58d23cb53..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.0.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.6.ebuild
similarity index 97%
rename from sys-kernel/gentoo-sources/gentoo-sources-5.0.0.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.0.6.ebuild
index 8784f9e16719..654410d84a7c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.0.0.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="7"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 18c1c2a0a0b7..4d5f5d7b671c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,14 +1,12 @@
 DIST linux-3.16.tar.xz 80501624 BLAKE2B 46de37c6e1bc3c57d4b77f772ccd372fd77f96989d19d341b8098dab13a86659e0c74802859226fc7b22879ddb05788cfc1aad020920e3acc53d5383aa496afa SHA512 64033e741d3f42ed06010e63e69d66e1d3d9414ef20f76834508878d4218b72619541a18ef4fd377204af2859e52198310998109b20ed9b67722586b28c9a231
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.0.tar.xz 105235152 BLAKE2B 59635c87a4123c90ab8598c9ea5167096aa6bc765e9d8456d00f3da7530e89e925b3925c99f1a6c96ac0ded7df3ac7df52c75672f0a66acc40f563200892e064 SHA512 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
-DIST patch-3.16.64.xz 2332792 BLAKE2B b99358369a0cbc2223eff58989625a1eac297c7aadb35757729be427d2e69cc58cd6a8a8c436243a4e22732bad870b17e7368197bc122445e99541cf4aac5c36 SHA512 dcb7c4ecdbc7740e400b7f78c8b45cec31fde46e70ba2d2b3b4645f8af4ad05392dfe4c8cec2301e6dea0c4ae42718e622ec631c2f1506fc18b1f9699b780e64
+DIST patch-3.16.65.xz 2351660 BLAKE2B 1b0241ff0834f1b6848e40176ed7136854abda895fb6ebe6d742261ec9fb876f94ca4c2cb7ffc66c7b84ad1637e6b8fdfd149cbe416a4f9d975130d5beec5403 SHA512 ce869cfcc8809544b4722d1bd4c55c7074f8941e8ab6d2816d1de4139c3507e141e58be0ac608999c6559e60742eda095d8b122257c746d53eddf8858d12a97f
 DIST patch-4.14.110.xz 2385964 BLAKE2B b94c333db63cb6635075ef314998ab68a2e415c22146719b9685b65f7389f1b96999575a1c5f67fbda7031f9ad12a5b00afd2d7bbbfc9d6652c7fdac5bba2eb3 SHA512 b9bb23f44f73c207f754a6185fd819494ebf2830f3acbf0da6c4bdf9b9594951b16bc39e997d3499387ad9b193320d0b47e09feb18bbf6f9e7edfe2a44eb2957
 DIST patch-4.19.33.xz 948052 BLAKE2B 9392890ce840fb4d856a7c4d3b34a23373660e1a656acf8b9c14f10af63c8924abc956bb284899a2fb8b0dc7d04e184339cfcefd4d1ccccad3b61c38e1e03202 SHA512 ed679130f1ef18fc41b30ed882ae2fdc6328ae9cb5d269d9b7450e6c302cd1a5dcbd43502c2cf491f6aa8eeff3dd0a8b8db0ed346d19c0880824dc2652df9ae5
-DIST patch-4.20.17.xz 507008 BLAKE2B c8d8141b1e7e2fb81a94b37fb6860e8d6e672f709d5ff97e1d85fe621ba8e54eb3a989372c69e8c521d59ce832a6683326d96229942ee9d749883295088bd10b SHA512 b4cc082504baa13145c201b4bd18ff7ebd4a77358d17d38adc54da1d19d36f125cf9fc6d82296dd1537e91e6b0bc4bcd44b14680b0bf7b45b8963b7f899d390b
 DIST patch-4.4.178.xz 2471820 BLAKE2B ecc10a4c395aa267eda47f181571d6cd0e0effb2918f283ad4b83a793d9e44b4656d80b64a3b60733630da8453ed4776594a3b147deb2fb8e74f49f5007946c6 SHA512 dd8f242a12b6955c7ffd87d7b80a0a68e9b215b75f3ab52eefbe045e198e58d2590f7aabbdebe8c1361b0ee36d0d192fd57a4129dd110a563d96bf99b97dfa1d
 DIST patch-4.9.167.xz 2650956 BLAKE2B 3ea9496f869abe8b2fd9324c22254f1c48e5de8ab1c9413290a812a045fc63ba180a71f1ba38973dfd74d1ce7a49fbe6680f6896fbb64c3e8b681b96785b41da SHA512 213c90cee637c32b907c0992e6ba243a6e51b5650dd40ec7083e372c226167d22514f14c1a0426c29d5262850ea25fc3ddb45729a0b65af71661c9b752b7a801
 DIST patch-5.0.6.xz 174976 BLAKE2B 3562b81c473fe2a37df7c3b021709416688efafe0159c5b271191d4dec0dacdac63d9e98033aa7030c270e719a3f25ed2dab9cbf1702a6e3a1b23730801763b8 SHA512 01375634c3d670b64d8e920176378d61a47e48571a37964c56abec8c0f80c791b75551eef137b05c5c647436cf63e692fe30391b5da14daeb8f5af39c12dcbfd
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.64.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.65.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.16.64.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.16.65.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.20.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.20.17.ebuild
deleted file mode 100644
index 6f2f5701c4ee..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.20.17.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 73cd652a964a..01992219b304 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
index fe6da3806626..8de12b7f8387 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ae272ebc053e..05e9840c2490 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/rtirq/rtirq-20150216.ebuild b/sys-process/rtirq/rtirq-20150216.ebuild
index 91f6fe3f3440..5bd86fb047b1 100644
--- a/sys-process/rtirq/rtirq-20150216.ebuild
+++ b/sys-process/rtirq/rtirq-20150216.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Modify realtime scheduling policy and priority of IRQ handlers"
-HOMEPAGE="http://www.rncbc.org/archive/#rtirq"
+HOMEPAGE="https://www.rncbc.org/archive/#rtirq"
 
-SRC_URI="http://www.rncbc.org/archive/${P}.tar.gz"
+SRC_URI="https://www.rncbc.org/archive/old/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-process/rtirq/rtirq-20180209.ebuild b/sys-process/rtirq/rtirq-20180209.ebuild
index 5186ad22dd47..f51c09b09172 100644
--- a/sys-process/rtirq/rtirq-20180209.ebuild
+++ b/sys-process/rtirq/rtirq-20180209.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"
@@ -6,8 +6,8 @@ EAPI="7"
 inherit linux-info systemd
 
 DESCRIPTION="Modify realtime scheduling policy and priority of IRQ handlers"
-HOMEPAGE="http://www.rncbc.org/archive/#rtirq"
-SRC_URI="http://www.rncbc.org/archive/${P}.tar.gz"
+HOMEPAGE="https://www.rncbc.org/archive/#rtirq"
+SRC_URI="https://www.rncbc.org/archive/old/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 17e69fc92f56..7b62a4d384f1 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index e48e37750a22..37a821c48341 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,3 +1,4 @@
 DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
 DIST owncloud-10.0.9.tar.bz2 40769945 BLAKE2B c2187838488e87a85a964a9f1cd181e203fef6475c8797f8fc7204ae91d00522193cf730340dcf3e08b85cb03992d8d922a1d72db0acfc3d77374f0f10f4cbea SHA512 756903ba98ca7612987e51d4f0d38452b8c38a3970ae6ac7ec0d30e469cd7cb7cf1a4a95dbe1a782c3ebddfdf3c2194193853b9f55cb75a9f0ef4c5a437c420b
 DIST owncloud-10.1.0.tar.bz2 20345340 BLAKE2B 0d5d6b1ea5ce6071ccd447737ab897e3ade60178497af538866ea60fdfad9b15a8971fcf921e1297d4b9b14a596c1397d7ae517cf8f0b9e9eb186511fe4e3210 SHA512 2e93510cc6a3668c4d1b9ad072aab05b44e531cadbc7e740a2d4c5822a221878fa2f3804cb2436461e3c2df46b59374bd641464c786a89582b01fcf816bb203d
+DIST owncloud-10.1.1.tar.bz2 20272676 BLAKE2B 36f4a1fb513dc1a49ba571935de309f78c12fad11b4b5297c48fa02541a7c7858ce8c525847c44b89e43a5142f52e37c9c23cfff71aef9380b4192729e5b110c SHA512 4252ac71b87bd7a6372507a501dea4022420b7c2cb6556ec258091238cf3b347a33cd56c2a8afefcf971c0bbd68422fc86db8be2e6bf8fb3b6c76ff3aac228e8
diff --git a/www-apps/owncloud/owncloud-10.1.1.ebuild b/www-apps/owncloud/owncloud-10.1.1.ebuild
new file mode 100644
index 000000000000..f493a0c561af
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/roundup/files/roundup-1.6.0-configparser.patch b/www-apps/roundup/files/roundup-1.6.0-configparser.patch
new file mode 100644
index 000000000000..6bdfc8dfaaad
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-configparser.patch
@@ -0,0 +1,40 @@
+changeset:   5625:99175953520e
+branch:      maint-1.6
+parent:      5537:d698d3d843a9
+user:        Joseph Myers <jsm@polyomino.org.uk>
+date:        Mon Aug 20 00:50:16 2018 +0000
+files:       CHANGES.txt roundup/configuration.py
+description:
+Fix issue2550994: breakage caused by configparser backports.
+
+
+diff -r d698d3d843a9 -r 99175953520e roundup/configuration.py
+--- a/roundup/configuration.py	Thu Sep 06 17:04:49 2018 -0400
++++ b/roundup/configuration.py	Mon Aug 20 00:50:16 2018 +0000
+@@ -2,9 +2,15 @@
+ #
+ __docformat__ = "restructuredtext"
+ 
+-try:
++# Some systems have a backport of the Python 3 configparser module to
++# Python 2: <https://pypi.org/project/configparser/>.  That breaks
++# Roundup if used with Python 2 because it generates unicode objects
++# where not expected by the Python code.  Thus, a version check is
++# used here instead of try/except.
++import sys
++if sys.version_info[0] > 2:
+     import configparser			# Python 3
+-except ImportError:
++else:
+     import ConfigParser as configparser	# Python 2
+ 
+ import getopt
+@@ -12,7 +18,6 @@
+ import logging, logging.config
+ import os
+ import re
+-import sys
+ import time
+ import smtplib
+ 
+
diff --git a/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch b/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch
new file mode 100644
index 000000000000..8be484d5f807
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch
@@ -0,0 +1,150 @@
+changeset:   5629:8e3df461d316
+branch:      maint-1.6
+user:        John Rouillard <rouilj@ieee.org>
+date:        Wed Feb 27 21:47:39 2019 -0500
+files:       CHANGES.txt roundup/cgi/client.py roundup/scripts/roundup_server.py test/test_cgi.py
+description:
+issue2551023: Fix CSRF headers for use with wsgi and cgi. The
+env variable array used - separators rather than _. Compare:
+HTTP_X-REQUESTED-WITH to HTTP_X_REQUESTED_WITH. The last is
+correct. Also fix roundup-server to produce the latter form. (Patch
+by Cédric Krier)
+
+
+diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/cgi/client.py
+--- a/roundup/cgi/client.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/roundup/cgi/client.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -1026,7 +1026,7 @@
+         # If required headers are missing, raise an error
+         for header in header_names:
+             if (config["WEB_CSRF_ENFORCE_HEADER_%s"%header] == 'required'
+-                    and "HTTP_%s"%header not in self.env):
++                    and "HTTP_%s" % header.replace('-', '_') not in self.env):
+                 logger.error(self._("csrf header %s required but missing for user%s."), header, current_user)
+                 raise Unauthorised, self._("Missing header: %s")%header
+                 
+@@ -1062,9 +1062,9 @@
+                 header_pass += 1
+                 
+         enforce=config['WEB_CSRF_ENFORCE_HEADER_X-FORWARDED-HOST']
+-        if 'HTTP_X-FORWARDED-HOST' in self.env:
++        if 'HTTP_X_FORWARDED_HOST' in self.env:
+             if enforce != "no":
+-                host = self.env['HTTP_X-FORWARDED-HOST']
++                host = self.env['HTTP_X_FORWARDED_HOST']
+                 foundat = self.base.find('://' + host + '/')
+                 # 4 means self.base has http:/ prefix, 5 means https:/ prefix
+                 if foundat not in [4, 5]:
+@@ -1111,7 +1111,7 @@
+                 # Note we do not use CSRF nonces for xmlrpc requests.
+                 #
+                 # see: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)_Prevention_Cheat_Sheet#Protecting_REST_Services:_Use_of_Custom_Request_Headers
+-                if 'HTTP_X-REQUESTED-WITH' not in self.env:
++                if 'HTTP_X_REQUESTED_WITH' not in self.env:
+                     logger.error(self._("csrf X-REQUESTED-WITH xmlrpc required header check failed for user%s."), current_user)
+                     raise UsageError, self._("Required Header Missing")
+ 
+diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/scripts/roundup_server.py
+--- a/roundup/scripts/roundup_server.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/roundup/scripts/roundup_server.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -384,8 +384,8 @@
+             # If behind a proxy, this is the hostname supplied
+             # via the Host header to the proxy. Used by core code.
+             # Controlled by the CSRF settings.
+-            env['HTTP_X-FORWARDED-HOST'] = xfh
+-        xff = self.headers.getheader('X-Forwarded-For', None)
++            env['HTTP_X_FORWARDED_HOST'] = xfh
++        xff = self.headers.get('X-Forwarded-For', None)
+         if xff:
+             # xff is a list of ip addresses for original client/proxies:
+             # X-Forwarded-For: clientIP, proxy1IP, proxy2IP
+@@ -394,8 +394,8 @@
+             # Made available for extensions if the user trusts it.
+             # E.g. you may wish to disable recaptcha validation extension
+             # if the ip of the client matches 172.16.0.0.
+-            env['HTTP_X-FORWARDED-FOR'] = xff
+-        xfp = self.headers.getheader('X-Forwarded-Proto', None)
++            env['HTTP_X_FORWARDED_FOR'] = xff
++        xfp = self.headers.get('X-Forwarded-Proto', None)
+         if xfp:
+             # xfp is the protocol (http/https) seen by proxies in the
+             # path of the request. I am not sure if there is only
+@@ -408,8 +408,8 @@
+             # May not be trustworthy. Do not use in core without
+             # config option to control its use.
+             # Made available for extensions if the user trusts it.
+-            env['HTTP_X-FORWARDED-PROTO'] = xfp
+-        if os.environ.has_key('CGI_SHOW_TIMING'):
++            env['HTTP_X_FORWARDED_PROTO'] = xfp
++        if 'CGI_SHOW_TIMING' in os.environ:
+             env['CGI_SHOW_TIMING'] = os.environ['CGI_SHOW_TIMING']
+         env['HTTP_ACCEPT_LANGUAGE'] = self.headers.get('accept-language')
+         referer = self.headers.get('Referer')
+@@ -420,8 +420,8 @@
+             env['HTTP_ORIGIN'] = origin
+         xrw = self.headers.get('x-requested-with')
+         if xrw:
+-            env['HTTP_X-REQUESTED-WITH'] = xrw
+-        range = self.headers.getheader('range')
++            env['HTTP_X_REQUESTED_WITH'] = xrw
++        range = self.headers.get('range')
+         if range:
+             env['HTTP_RANGE'] = range
+ 
+diff -r 64ceb9c14b28 -r 8e3df461d316 test/test_cgi.py
+--- a/test/test_cgi.py	Tue Feb 12 21:31:41 2019 -0500
++++ b/test/test_cgi.py	Wed Feb 27 21:47:39 2019 -0500
+@@ -888,7 +888,7 @@
+         del(cl.env['HTTP_ORIGIN'])
+         del(out[0])
+ 
+-        cl.env['HTTP_X-FORWARDED-HOST'] = 'whoami.com'
++        cl.env['HTTP_X_FORWARDED_HOST'] = 'whoami.com'
+         # if there is an X-FORWARDED-HOST header it is used and
+         # HOST header is ignored. X-FORWARDED-HOST should only be
+         # passed/set by a proxy. In this case the HOST header is
+@@ -899,7 +899,7 @@
+         match_at=out[0].find('Redirecting to <a href="http://whoami.com/path/issue1?@ok_message')
+         print "result of subtest 4:", out[0]
+         self.assertNotEqual(match_at, -1)
+-        del(cl.env['HTTP_X-FORWARDED-HOST'])
++        del(cl.env['HTTP_X_FORWARDED_HOST'])
+         del(cl.env['HTTP_HOST'])
+         del(out[0])
+ 
+@@ -912,14 +912,14 @@
+         del(out[0])
+ 
+         # try failing headers
+-        cl.env['HTTP_X-FORWARDED-HOST'] = 'whoami.net'
++        cl.env['HTTP_X_FORWARDED_HOST'] = 'whoami.net'
+         # this raises an error as the header check passes and 
+         # it did the edit and tries to send mail.
+         cl.inner_main()
+         match_at=out[0].find('Invalid X-FORWARDED-HOST whoami.net')
+         print "result of subtest 6:", out[0]
+         self.assertNotEqual(match_at, -1)
+-        del(cl.env['HTTP_X-FORWARDED-HOST'])
++        del(cl.env['HTTP_X_FORWARDED_HOST'])
+         del(out[0])
+ 
+         # header checks succeed
+@@ -1031,7 +1031,7 @@
+                             'CONTENT_TYPE': 'text/plain',
+                             'HTTP_AUTHORIZATION': 'Basic YWRtaW46YWRtaW4=',
+                             'HTTP_REFERER': 'http://whoami.com/path/',
+-                            'HTTP_X-REQUESTED-WITH': "XMLHttpRequest"
++                            'HTTP_X_REQUESTED_WITH': "XMLHttpRequest"
+                         }, form)
+         cl.db = self.db
+         cl.base = 'http://whoami.com/path/'
+@@ -1059,7 +1059,7 @@
+         del(out[0])
+ 
+         # remove the X-REQUESTED-WITH header and get an xmlrpc fault returned
+-        del(cl.env['HTTP_X-REQUESTED-WITH'])
++        del(cl.env['HTTP_X_REQUESTED_WITH'])
+         cl.handle_xmlrpc()
+         output="<?xml version='1.0'?>\n<methodResponse>\n<fault>\n<value><struct>\n<member>\n<name>faultCode</name>\n<value><int>1</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>&lt;class 'roundup.exceptions.UsageError'&gt;:Required Header Missing</string></value>\n</member>\n</struct></value>\n</fault>\n</methodResponse>\n"
+         print out[0]
+
diff --git a/www-apps/roundup/files/roundup-1.6.0-xss.patch b/www-apps/roundup/files/roundup-1.6.0-xss.patch
new file mode 100644
index 000000000000..44a607e0c46b
--- /dev/null
+++ b/www-apps/roundup/files/roundup-1.6.0-xss.patch
@@ -0,0 +1,35 @@
+changeset:   5665:ab37c1705dbf
+branch:      maint-1.6
+parent:      5635:ea35ab75a4c0
+user:        John Rouillard <rouilj@ieee.org>
+date:        Fri Mar 22 18:16:11 2019 -0400
+files:       CHANGES.txt frontends/roundup.cgi roundup/cgi/wsgi_handler.py
+description:
+Fix fix XSS issue in wsgi and cgi when handing url not found/404. issue2551035
+
+
+diff -r ea35ab75a4c0 -r ab37c1705dbf frontends/roundup.cgi
+--- a/frontends/roundup.cgi	Thu Mar 07 15:42:21 2019 +0100
++++ b/frontends/roundup.cgi	Fri Mar 22 18:16:11 2019 -0400
+@@ -179,7 +179,7 @@
+                 request.send_response(404)
+                 request.send_header('Content-Type', 'text/html')
+                 request.end_headers()
+-                out.write('Not found: %s'%client.path)
++                out.write('Not found: %s'%cgi.escape(client.path))
+ 
+     else:
+         import urllib
+diff -r ea35ab75a4c0 -r ab37c1705dbf roundup/cgi/wsgi_handler.py
+--- a/roundup/cgi/wsgi_handler.py	Thu Mar 07 15:42:21 2019 +0100
++++ b/roundup/cgi/wsgi_handler.py	Fri Mar 22 18:16:11 2019 -0400
+@@ -66,7 +66,7 @@
+             client.main()
+         except roundup.cgi.client.NotFound:
+             request.start_response([('Content-Type', 'text/html')], 404)
+-            request.wfile.write('Not found: %s'%client.path)
++            request.wfile.write('Not found: %s'%cgi.escape(client.path))
+ 
+         # all body data has been written using wfile
+         return []
+
diff --git a/www-apps/roundup/roundup-1.6.0.ebuild b/www-apps/roundup/roundup-1.6.0-r1.ebuild
similarity index 85%
rename from www-apps/roundup/roundup-1.6.0.ebuild
rename to www-apps/roundup/roundup-1.6.0-r1.ebuild
index bb623df06580..4e1c93d0283a 100644
--- a/www-apps/roundup/roundup-1.6.0.ebuild
+++ b/www-apps/roundup/roundup-1.6.0-r1.ebuild
@@ -19,6 +19,12 @@ RDEPEND="${DEPEND}"
 
 DOCS="CHANGES.txt doc/*.txt"
 
+PATCHES=(
+	"${FILESDIR}/${P}-configparser.patch"
+	"${FILESDIR}/${P}-csrf-headers.patch"
+	"${FILESDIR}/${P}-xss.patch"
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	rm -r "${ED}"/usr/share/doc/${PN} || die
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e1c35689c4da..9e30ed47b512 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 565a49232504..024b69106b08 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -91,193 +91,7 @@ DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f4728532
 DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
 DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766 SHA512 bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
-DIST firefox-60.5-patches-01.tar.xz 13332 BLAKE2B 53308d415369c6814504697ed9692023e636c42b58053867fd14e8edd94baa2777ed9f33e147f796d6fcd5f30c1d2258f9fd3247392e37a921a53f41a6903e92 SHA512 de24544c5aa8ade35e4e3e0fac10399f8eb44ea4bb9063b85bbcf2db12280d23ccc5fd29032f33f3723c0a0c3c2381429e2c19bd631e90615908b4f68f745a21
-DIST firefox-60.5.2esr-ach.xpi 496846 BLAKE2B 592ec91f9cb0491489b11c978be006a4bc36631bbe77cc7ac5364d29d2484a7e5f761868258afb2ab6f95270b238390a8c452e00f42c74fe84f43f808582df76 SHA512 6b93db9ebc005dbaa7bba18859e23c8d545b4d50e372523690f393f2ba9e988e688b7420d384f50e12bba9cf6e15b050da83d064a7ac41800ad8ebd094d111e1
-DIST firefox-60.5.2esr-af.xpi 487312 BLAKE2B ae7cd9ebab3e66d487aaa4e4d1d0874a09215ab1325ec39fe1a2a7aae3c8d3bd2065329ad7a345979cfbd62cefd77e87b0baa1035a5416ca95214eef3ecb3056 SHA512 b6d012951b9fa8e4a3f3736817d6fd23b2cd5db9712fd9f78f8cd02207d35bbd0b0587669b480f7aac08d76e63adc9e3873e36fff27f5d3fe44569fb2e4ea430
-DIST firefox-60.5.2esr-an.xpi 520509 BLAKE2B d244db7b6c7e80a29433a0e239228567e786b9ed09e87fdbd787cd680a8259cbc5cf8294c1cb045cdfc3d55c81d7dbc9e3596e20689377402b5ddd47ac512ea5 SHA512 f516d441d8ab89bef8244db13f96e9c4e97534e8cd11e1a5b84f4ef248c5617061d8faf56dd6d6d22d1ae6c5c69048f44f02207e23808bc47251b1d9925809ac
-DIST firefox-60.5.2esr-ar.xpi 547823 BLAKE2B b5f46cec583dd15bdbb3907b99cf4175ee2f8409f525f9499ed8e870306e7726312beb0e2df428ba79effaea2ac21d62e181bf687e7ff67357eb7b3655e2165b SHA512 212b2f7d42a87a97d509f9a6f2597baaf0667db14d437802a63763bc2768b16d72da2be445ef0ae396218677ed9a5cd2bd1373cf83fcc4b2304e2bb9ce04d80f
-DIST firefox-60.5.2esr-as.xpi 530728 BLAKE2B 282171220b4f1cabc6a8f2a8afd0a4b4dfe7a6076d22ab305f3dd96cbc3a6596bd9a1e3011d451a11d81c4960e56f75d276bd155596804d3934b36b3c43b27b0 SHA512 a7e0c7bd75a28d193c13abe80932425afadf9dcfc73be94604d960faa613e3e6dcff9ce9a3d3c851a342ff69e0af2a56720c6e319ce0817efa17bdbca5988ccb
-DIST firefox-60.5.2esr-ast.xpi 508658 BLAKE2B 757da31e335f6a1c3e3bba72f24c9c317fbb1a4131a3dbd1191c81d7a8955935e47964f3ae29db1b27f532a23448314756f4ecd8efbb307c029d827d58af0bb1 SHA512 4b0fdfe94e8f8ff00075beacefd8f52b02aeb26c2799c065a35bf14b926ae86215a1fa680eedc25e2276df5f23f9b2b0a532af1876334ce1ebac816fd3e7a8a7
-DIST firefox-60.5.2esr-az.xpi 524748 BLAKE2B ada3828cd20b8a78bcf400995d19f1a48cfad6ee87105a81e95f55c1e53c602bb9d7758946fee7e4b26500f9b818bfd8001709e7fe6d7a582770669e97f8b220 SHA512 4b895d57c2718c877bf6457ce4d4fdcd6c0d29fff9cc8dbb8346d9970ef587018957f574676b2be552f134efe075f165e20013523450a4e9d644f2143c66fdf0
-DIST firefox-60.5.2esr-bg.xpi 573854 BLAKE2B e47a491b42e0e18ddcf53a74fff726eab2bc86306cf4cb8081def80025b8f0f322eae1b7c1c9c93e4820f4152242babf3b501066784397f4bc65e036ba29c071 SHA512 7bb40018d6557e91b1eab8035bafb97e043804b071154b8bb09876a22b6c3f43bdc38c981d36006b92f50e0fb711df9f60b85e346124be77bbff81c9200994d3
-DIST firefox-60.5.2esr-bn-BD.xpi 590429 BLAKE2B e7ededa2fa9e07ef419ead26fc3e872a5c4d6840d2ba3a520435c51c2dd6ac2b0429366e9be1fd3c8ede966c48f7652a81e6e59256ad303bac0912b72bedf59f SHA512 b44c71269beb5928f7c61aec01643fbc13d034f4663e07f011067de40a147b6efa6c59ba2f2157711a858557cbf904f5b0e92441c464ffda29f110533b03c1da
-DIST firefox-60.5.2esr-bn-IN.xpi 570870 BLAKE2B 49945c22fd5ccee8b253cabe8db86711b9b389c5862dbbbe11eb8d5b95abfc09de30fcab805f1df90181002ec732ab538c50327bd9b3fdba7d99ff4c1a3f7bc6 SHA512 f2305f5610ca0e1ecfd3593980d186f1685ca3226533ea0cc65914d2940ed37421acec0ac09a1282c50ed9c08d670d360527522c5c0dd6d4fbd759b35f78153b
-DIST firefox-60.5.2esr-br.xpi 512031 BLAKE2B 1ac52bc69ebbe8b9b2914f9b6ef20ceaed04fdfe6fa65371afb4561d563501326216057e00cdf1a079da408b3e8121d59741f6940105367dee39707c8495c297 SHA512 c417c7d0733d8fe7f605b7e91e1b289a993301e5e5743bcd22b167d9e73b78f3ac94628f1c28ee0ba28dc9db3a213db97d5132938298a586eef12bfe0ebc913e
-DIST firefox-60.5.2esr-bs.xpi 514712 BLAKE2B 85caee9857ec7f9a4f83027979167f7dc91657187a329d6c577fbd65e1022ae16857ddaacd9b041cd3cfb1ce6161a1f644d33e0e7e8352f028121d36d917be2b SHA512 fb3d86dc7b065e84bcf50420973a10d553fb16b480cf923b59802aae17cf44af9948115c7018b5a08e7e5a2ff890a0586742c27e61c04b1ef72776c1bcfbcea5
-DIST firefox-60.5.2esr-ca.xpi 525260 BLAKE2B 679992e12025173b26147fb501f864e1cc3cfe2ab11babd1fe2f1bc55e932d18877b2672a43a6dc2c44989fd04f91005f7ee230bd80eb0c312e9621b4bdf2a91 SHA512 574e871d6c0331235c5212e043b4ad2f0dfc5a05b87158d15745d79671b9351c46757cf520db68d5bdc90a7fb60f3ed8fcbfd13828f003a6ce9bbb3d889c1a44
-DIST firefox-60.5.2esr-cak.xpi 536304 BLAKE2B 66466926c673e339b59497be29a4a0d8189a89d92754e46560b86f637283e906af125f54459784cd3859fd53ca8d08bd4e17df2f63e4c9ee674afc3249a5a5d4 SHA512 907172411ffc47245ed9b725b466d685fa51524c5681ace39fbf7e3959501d75238003aca18299efe9eeee29611319b28abb2e907939e834f946092b1534994c
-DIST firefox-60.5.2esr-cs.xpi 531803 BLAKE2B f7395a1cacd6ce82c07a9df6d0ed53802ac1ba2bc38645e9d00172a6b14ec3ad69033f0d35a7d32360c44382feb78a72fa18f889a75c49c1130bd97e045e9666 SHA512 80f9984c71c211225e46a47c21ec52f882007d0f3ac79eed42b41b5d6c496110b56600492a9acf9f711962244594b549118a7585b8da002257098c40934b24d1
-DIST firefox-60.5.2esr-cy.xpi 516641 BLAKE2B 3eaacff3594fbb690981183ac2b4e44f9aa1997cc5f48d8874a5f62b22ce5bd65b071e54cd1be3c17900874189c36ce7dc2cbebc83f6fa9c2811997abc255190 SHA512 068d3d5dc84754ec7a2ec7dc979dc8955a2ef2ae9ad217293eceb7f761f47060e7f547310d4033843da1706854af5e07b323f5fce6bd3c64df6c6f48ebad49d7
-DIST firefox-60.5.2esr-da.xpi 510761 BLAKE2B cbf52afa1a618e6e3022c8a66994a45eb47274d7f67bd58b1c35cd6647c3a7d70193bd3b64e06e550c0f329916d9d13b12e008f03e784cfb9e4ea7426a3f149d SHA512 cb2b519c479e258384a73463a87cfccfcabc65a04c14397ab2d9f0aeb8986ac7260ed084b52ceab7df7d91c8c8ad4828e47e761dc41c304fdd80724fc62cb651
-DIST firefox-60.5.2esr-de.xpi 526522 BLAKE2B e51f713e6f50b1f113d3f3b2946a7429017b9d3202c5276ad4385a91e2e7d4ac6b4f87ac7b419e5397968654eba28fd5c38dd81a0c15c33e3b0d3145946ac1e0 SHA512 24bd6d3fdfdf793877d894c2d227262b7cfa1ed8e36e305fbdb5fa966fcfcacfe13cf5c45b066a3071fea093e597286d0c44876db486be688e1a1bc96a9490dd
-DIST firefox-60.5.2esr-dsb.xpi 539526 BLAKE2B 2f86cbeacac584a1899d811007953b95ee818f9dc8653c9a881e7729c11de1d52b1d89ccc42d3fccefecfd159ab776199884f9fda39d8e2857093181352aa387 SHA512 bce83c87aede85e0a590369c94fda307da58393a4f2199d971bd13612326daa0fd736a10e9210f9c91fbbfd0b35d331ce2d70298afb2db016bd6bdb927f3303d
-DIST firefox-60.5.2esr-el.xpi 593701 BLAKE2B 5cf0bd98c7c2dbe072366591e46e116a9960507e153905250b84e65559f401545208f69042d0ff8a71fbbae61ddaeb2da85fa8b8fd1566568a53b9af9c84995f SHA512 5ce990003077becea6aa12e91f858a7005d4ff6c61aad87638ee54fed9a1abb2efe78d6344c6018103eaf6747ca8a9c4fb795cb05ae392f19b439e2f744ca98a
-DIST firefox-60.5.2esr-en-GB.xpi 491695 BLAKE2B 824e09fb90b7380da242e3612381143ccb706749558d6eac689673affb14df8d2dc53c1b9fcbcd1ba52612bfab0273d134626bbeefee8ed2547a271e6566cdb7 SHA512 314db9853ccda19861d2b201ea38492ff07841542a5e73e21fa86530fb6227727fcfbf4240deb473c0a337e03bc2dd989e6f6658a5051200ff11875f70db2a1f
-DIST firefox-60.5.2esr-en-ZA.xpi 474675 BLAKE2B 3538166bd202ff3090699aac6e9904faadc83ff33b6504d36fd3a1f0f3560a556c5a2cf7b18d00e64725910fe9ed8e5c290fa4da2414937a957ce6630778a114 SHA512 ffa3704820c1e263792b8270f3d7f8b943cb6aee26bf7a42a71ba14fd903588b7add62f94f5ddd8c4b1a0268feef91c4fed0a5ac1d1e0dd1a9ace8b61863999e
-DIST firefox-60.5.2esr-eo.xpi 511260 BLAKE2B ec169ce641adfdac9c77724260931a30245d1593afe848830a13f6f6ef9948b59108b0dcfa356d51b2c9c9926f2e6cf61509f8411af271c59b0befdde65e5f66 SHA512 84bfd506fd8312cbcd1c9750154fce7a770278b3f120ff117de3add7c4b0ee13a4429658c98978589619caefad9d722b93b7513e75ee511ac31e576985ec3bd6
-DIST firefox-60.5.2esr-es-AR.xpi 524657 BLAKE2B e6f1f05aec7a7a4af540ce0df67750e2fef44a923c0d6a9ebe3692afabe4c37cb0b5a5703b46d168bfc849b6599ff62169f87525c37fff7bf2c7ecc78238f4e2 SHA512 666f262a395a8a9cac61e09798a8188f56cea48aa34dedc3a3c1d31ac56d568d24f6dd3fc8fd34c03604f9e5d54ef86607bcf46c8e94ce33c092f4e6e2c60b99
-DIST firefox-60.5.2esr-es-CL.xpi 527324 BLAKE2B 9ad1447641a1508a307938f05f090ac92c58770e4eb9d492e8ba1d07a69363d178b9a0fd3d79203e3207123990e5c25963127b93328afc8732b514df982edb63 SHA512 6044359cccac8792d6710c8176dbce00c55b726f0eedb04703c90b052370fa9dba07b90e7e99cefc9e5c671666b36684f4ecd3155cdc6baa4f36fdab7239098a
-DIST firefox-60.5.2esr-es-ES.xpi 459965 BLAKE2B e43ed0b6d9ef88359a2593e1cd677175dd6968190a7adccaa8ecc5f8d288901e247c6c0e771b7837cc4cd4eceffdaee734648580db92e0643ee20012826c8639 SHA512 cd06946224b07797beb80bf2dc6ea9855c17efbe59fa96d04353bfed98fa584063c3ffaef6315808fcc62e9671c2e3aeb637376d9317aa67ad30f4eccc9b54a2
-DIST firefox-60.5.2esr-es-MX.xpi 528666 BLAKE2B 919ece92fab4aa2e9079a55e44ebcaa9b7be4adfec8e20ba5d122d28c74b8d2b5a79dc0be4a24600a71000c927802bb421fe2aef03a0f1be39eb7ffb0a1ad5ae SHA512 20a8783a592275d72d5afe71707ab9c8b9f1714f346622ec5775c632e7a64d2b3d9c7ab5f283ad8821c32ad6fd8b8ef9a1c7c269479dc6643142cd7f4430750d
-DIST firefox-60.5.2esr-et.xpi 504971 BLAKE2B 521334770ddc0b5dafa756c1c6204c223e11addf2a32268bc368a3d01f720c54eac77741865af1322897b71b8b22845efd12a863fdfa5f930431606d83dc6467 SHA512 e6b9469185a0af3634d0c373d77c31f8235088ac96f4108cb6c318cc21c074fa130fe7e8c8c35cbff75545e0003ddb79c4d0ac73ecf6df0b3a482a64cb750c85
-DIST firefox-60.5.2esr-eu.xpi 511712 BLAKE2B c932cf188f24276f3d6a48166c16ef52964425caef019a075d2ada11400bdd345b2fd34e6c0a44be71fe521c9023815cdf8e4efcb284fb7a718954caea0d2f9b SHA512 a957f8ea20abb769cdc41148baa8e8581b669ed867a252c3fc8edc7d0355ed17e9adcb5d5048e966b5667e2c470e257248ba76bea0d2caa020ef160bcc61cc5f
-DIST firefox-60.5.2esr-fa.xpi 566268 BLAKE2B c8efb214c01cabd7f40ba45fb7dda44ff92a0ed8f34002cdd7ee45cfbd436af4634183b255752007bd8201fb8a6188ed5e858d9e11b224493f3627e3f8c35d7e SHA512 e65d3c5402699343398f59f9f18b3ce45712bd5cc3db0a83d39740a699ff9a1927285b98d94dde11a3b929d9bb8c702e8f9b338c416530a5d35d2a986b73ec1f
-DIST firefox-60.5.2esr-ff.xpi 512216 BLAKE2B db82459b6eab3b07977e160de99b8f27a695db55ab34c6f18650477514cfb24a64c6cab1218a029a0989cddcdeb74b0e16b03a1a803a2216db195ff0b281bda8 SHA512 b3084c4e6839c8a9d832b44f89a31cbe849c3d6bc54e0e963e4e69a419c902280a55a23696c4bdca63f27e31dd6b4fdca88e5f8f9c8aec21ad505eee242849a9
-DIST firefox-60.5.2esr-fi.xpi 506180 BLAKE2B dbd368a3a9b25b921310d07bf0778c0260571156e508861217e242403bde30cc3ace2aa433447a13c45fe16cce0e61a49aeb588fd102288ae6fea5f0fbaf59d0 SHA512 6c177d122ab4fb4f14b3984adc1c605aed73080c5cbd720d6577a07a238936fcc64d5d7fbfb3efcfc72f731fd08ebd438724aec93c028aebebb4285caaeffa29
-DIST firefox-60.5.2esr-fr.xpi 536073 BLAKE2B 280cb1a0016ae47452467766dc9d24939c9b6b2f5accb2b224aaa5e023a236985b3771ae5b40a4703b77d58cc8d810447d8be2c575417380e0fc3a72ad41e0b9 SHA512 3db8044834333d9fa1d0d0c7fdd134fdc7f129399db49b5d061738e001b21b1462e297c1270a8976138d31aac3acef53dcb4dd4f70225242fd27565e6b2f7073
-DIST firefox-60.5.2esr-fy-NL.xpi 524523 BLAKE2B 59ec5eb83d0ee0892fe0a481e7553e8134293e7b8697ea0e83df17a8e2e6ef3c73a49f7ac74cb6254ea513331465d1c553563652ce047c6148f766e28ffbac6b SHA512 6425e8410a91e3dde058300969e899721a7abbd0c24dc14493126c0484548b840a12dee5a1384a5e1d5b1af541f46b5879fe80b40cc43bb72fbc3f48900883a3
-DIST firefox-60.5.2esr-ga-IE.xpi 526994 BLAKE2B b1e4fb737f4de578058ad747b8655c8a73a7a3b63f89180ad07fd5e4a422b89331355731a913c1170d8b54242cf9e8fa895a432a6f8d34c7b6746b7d5dc0b0b3 SHA512 1dc6a6c1d064d7f34b6c6226120da289d22a79d879541878a041a29ac0a80c46757a5382e858732436234e9ac269c3a7da93ea5ce9ff2a6469cac58594bc976a
-DIST firefox-60.5.2esr-gd.xpi 520871 BLAKE2B f2168f76d660ff8ffc730499646c61584837e4df36d2e8e5916faa35d911a0dff9fa1ff3b880127f488664853bfc460ff36b3242ff6f2cd2579994752c1bec25 SHA512 2ccbe6ec70300c5957b62b24efea74b585a10d2518ed828d2242a499a9d3378b0dc8cf16d4de546cad634a42f55af7195a0092673dec936e152793aa28e06cf4
-DIST firefox-60.5.2esr-gl.xpi 497379 BLAKE2B 9d94ad6e7bbd1d56fde33d1934553e3814ea233bca293fb00fb3a1490de7a1051dc498bbe8ce90825713a204b3fa421874afad243d82c03d19f86667fe649451 SHA512 0f27e5151f2ae3b0e75fba743edca49bfc25306315d9aef585875975d2393ab844f801c1f7190f6f700f69feeef6da9d7303e0d27395bb427f8d0bc1683981b4
-DIST firefox-60.5.2esr-gn.xpi 533223 BLAKE2B c389edcb0f0c12c84c0fa51feec1c32c09d29b3fad4a919f71d15cb48307c02c88fcf80f4c8457c3b8d6c56666a1b617e33f300023357535fd5a49ae03e341fd SHA512 4d845205889b318a210f55c82ff3d61927117ed428b1c64ed61ce406ac6b73eacd8b67ca5901aeeb7455f50c7016e370fd5b9a05d844e10ee4304260e863396c
-DIST firefox-60.5.2esr-gu-IN.xpi 590268 BLAKE2B e3f29771cb63767d95d2d4d9749b784b877fe67c8f16840d214dda9ead30a3a3540c55558756110cf323af3c589d03f23f7de39a2a053eb3510ec23f853f6280 SHA512 aade64e59ad6b9fc19d38de2d4b3a0de3d1f50238e6d5fddad0a01f45b2166c15f91303bec62f47269691932ea3816054d47d399fbcb5191d418f4c0528a4636
-DIST firefox-60.5.2esr-he.xpi 535987 BLAKE2B 7762cfba61c3789703321cc2a96f5b927b8c0c86b8b9c6bbb8fb38114929960458f33e6b9ca2ce15b28e4ea63a0bfd80a930a74371a5b80e87958ae2dbfa8f44 SHA512 a630853e7da37c954d9eed4f35701dc1fe35851b71f198aa962edd1fd3f0aff5a9d3869eebc52c14db83e638d8f7774293b64ebd30b4387e3de93ee1f3acb9e2
-DIST firefox-60.5.2esr-hi-IN.xpi 590861 BLAKE2B 5cece8dceafbe003b9c851193594f4e73b4801bfb0119d36e1af68954db02a6a16e7e94d73c47cb9722f850991fbf7e11dbcbd5ee62c9a8d061982c495821d1d SHA512 e673f74f99e7f7746e015f9069c846bb015e70b29b1f528d70005c331eca001f51327f2c9e0b269391a1dfc071e76b4466ccafe675fe8b282636bbc17f5dea1c
-DIST firefox-60.5.2esr-hr.xpi 515966 BLAKE2B 5247acd2e876165319c1e3c6fc030b97c5338c4faa562e678ab5f3f469718aca3106bb66c67b2e3687ea8df6f11bb41c2ba98a9d20e435a710e31502bdc8d1a1 SHA512 5e231aaffd956c799f103ed0daf5257c1dd6401f14193988eb2300cd736586cd7db58651e63063f8a474f8661886ff62224d74fd4e31153e9aebb5037a3eec0d
-DIST firefox-60.5.2esr-hsb.xpi 537069 BLAKE2B 5fa0ab882e03f9e1965c8d65a6e43ec25c8957c87284e7b9de13a25e29c618837a32147f8224fa3ef9dbd18be503303a1dccdf15338b24a94f8456dc8e210dfc SHA512 563986983cb4c65a55dd92683c4743626ef5caa30a0ee757ede43712d508970749f82de4148c5931c33524d423de3e26df6bd13ee9dec10a159b6bc78a219ed4
-DIST firefox-60.5.2esr-hu.xpi 538420 BLAKE2B 21ae14ae7280cfd0622dbe08b1abb7e800b675b1819825ec3e72f2d5d300106de0bf04061e2f9383c329df8f7f13306b59df4cdce3a54e305e78fee4c606213d SHA512 46fa9413ffcd3dddc6253de92e735ef55a5431f952880f9fb4e96fd71ed891fe3e04fadce38ba0929f7ec91d983795264065ec1787194b74421483b142bb1721
-DIST firefox-60.5.2esr-hy-AM.xpi 569421 BLAKE2B f935b8a6613e578a780dfe2f6c56d8c7939fa66c4d6f02bf593982c28fb02a9a9b65b51533ccfca88da52be350ca877c87002265c30621e9da0aa7ecdc64295f SHA512 3f411bc2e7d563e5a60510d4ea903ef0dd601d9b9e86a0e93e99045c70df955630aa3a5297f02635545191622b507304f657a9bc56d1f777771435c6f7dfd4d6
-DIST firefox-60.5.2esr-id.xpi 502230 BLAKE2B ece0f9afadd648b60f0cc78d81fee4237f2862e339282583f5e770988d2db307d5f1c1f40456855b9a3002ca43155c812dbc0f649cd435017828bd9f978f7dbf SHA512 babc9ae5c0fdfe123fe4c4fa539f3419e939cd635a1a1e9dda393b55dc510e99cd3545f57d6dfcb82d08ecffa505fdf1f9c65c057dcbed2d3b98a47a68e43fff
-DIST firefox-60.5.2esr-is.xpi 513277 BLAKE2B 94a8405a39a6b0648b712933ffab91409030aea6a0667b2d1211aebd543171eb22ca963c8196e48df2fd22a94bd96ad3034b0c05ece850f094b0cb286957b387 SHA512 ebf61049bd4186a2fd743268858cf92f309cce8484aa86c380f2589ef226887ea8a375c08ae3da1d9ed1060584591172da1c23fa3fc6cc06409ffba55fa0ba85
-DIST firefox-60.5.2esr-it.xpi 399103 BLAKE2B d7c902b1d2719d13bc171c32362bcf132b6d8913b8265f6a1e56c3550129d938dfd660c09e379bd102e1ed5a8b4a4a45408ca381e574b482886ad36f8b881a02 SHA512 9f413d4b06e318bb1d88b6cbf0db72d7a10eb8959347b6ef9c77038bddb2183469d2b384cf3a28c1bc05dfb6dc3d710dc3f3f71a103c9649deb6e85ed29127b1
-DIST firefox-60.5.2esr-ja.xpi 572017 BLAKE2B e084d791564ab7a20b8dd4fc771a854c177d5fbcc65f58303fade4e95b3202d9148002d72775d157c8aa9edc63441afd3f9e82ceca1616f376eb2270bcec3882 SHA512 2f7dada4822deec654d766cfe783c9fb62367f1a64461c2ce0be1c1218b69d41f9592de3f067514a1a047584af97f929be057f0d5a86cd25194c0379df462f9f
-DIST firefox-60.5.2esr-ka.xpi 556840 BLAKE2B 01fadb35f6a6df396f120e015a601dce4d9565943838ea5aba6b91e7bc29602f5235bc90fdd386457c4dbd8431d1c55a2bea52f29caa55a70fa8a1ce6849f630 SHA512 30b2ec8c818b140c4dd38d595f72683f1dc07356970c4a09c9c8c4bd3de2a9fa23f8090269b018c81d9caf6cc513240c4dd4609051e4863b70d9a80f233b5a40
-DIST firefox-60.5.2esr-kab.xpi 520406 BLAKE2B dfc095734996f4349e030e6eeeeb21a3f77600ee8def393b26a65337795ac3b16a6bdae3797a9bce54b1ddee124ea09888d22df58dea0f41e18f425678deffc6 SHA512 8b678e57afe7b435734aebf072b4f69546be42f8fe2204faf6f54aece00a8fbf5ef7cb5fd58764fe4aac8e56df43a98b06665659cedb8bed5b7b38be25b4dbbc
-DIST firefox-60.5.2esr-kk.xpi 582984 BLAKE2B 1e63e40ca8e87fac8420de4ce808806ba174964610ceaf0eefd81ba9cc8543dc1c95eab88266ac9d9b51079a7f92aed4f4eb7c83750be2d1c52320369f5048e9 SHA512 1a5d1c816f5dad749baa3f7aaceda549995bbe28aeb3d76de396397d356b9e51d226cce6b000dd15092da9415ce1512c180d55da60d3761109ac9feb330ea4af
-DIST firefox-60.5.2esr-km.xpi 583111 BLAKE2B 3ccb9f18a2f16a2313e2616eb44e44ea87ab02d8aa061d8bc738b6ac706264041f2a013fe0afef069970148f678b0c8cce46adba56c01586e1298259656786d1 SHA512 67f0c7e325a73af46af6a6263d0194722832d22dc9553e33f8daa30957e0cf2f336197774dd307d9c7c0df9fe0b08644e26ed0481a7d91feda8905eba4f2ff98
-DIST firefox-60.5.2esr-kn.xpi 585873 BLAKE2B 1297668cd8510365ad01ad543ec1080d75086d9de629096d5b9397990b539e3639c1ceace4925f653ce2beb78e06cbb38af176c2ce7ea8fe121abde0ee841750 SHA512 ea462be8fdbfb58aa50aa806026294149a7c4e97f298604f1645b4b682c92b951deac3ef964675b80df82655c28b12b1b07016a8cfaa9b60b2b4d362dd59d6be
-DIST firefox-60.5.2esr-ko.xpi 547821 BLAKE2B 45f1406a25cefb291ba14197ef74320b9afa3d004df3d8ca10e4276fe039fafb06f19c60429538e93b11db2e9aa9fe62346d50f33939d0e6855adea5600c5152 SHA512 0e520e7ae463d56c22f74f38e70e555cd2e18add7b922e646494cf1acf6f8409996e0719f67452b2444f65f755905f0bb74710591246c025332d53b0cf3469ed
-DIST firefox-60.5.2esr-lij.xpi 513182 BLAKE2B 0e6185cff47942763783bbf57a9a1461e10dbb054bb8bc0572d6207dd67db8ab313a006c9f11832e0ed75780ab92e8a189145936addec0324e1365728610b840 SHA512 44e83795c91345990c451fa042391dfb3d786da888b54f59e6c9dca627b7071a250e71dad6bf3c37a1114ac3817fba08e1c73dc72cea0d7cf3ba3883a782b500
-DIST firefox-60.5.2esr-lt.xpi 536463 BLAKE2B 3482d3d45d38cde933d350be9ebd060928dd559cb9f305351fef031c9361da4d2d4e018628d73ac16be1a46472e150c9e425881acf14fb5aabcfa8bec5f49b0d SHA512 7b310ed98df6766141a779f4d492cc26d5deba7ca94b7c09e9f5e343348bfaefb20c6ce7998465b2b70f7eeb36f7231467d5e344d852bdb319119328ad533938
-DIST firefox-60.5.2esr-lv.xpi 526415 BLAKE2B 69c60b980ad161daeb9a765a2460ac6868debe87e8d29bf6756ed82994be4403e7e18f50e883afb43b7d42300f518d17d486de3332e17c07c107ac3accb66702 SHA512 b27ba4f961b2d4073f13d6266ea2029253d9366aa9284ce341994c355a7ac80fa0952a1dc1902a342e401d1c24493842c81682dbe6d2ed6c3d11c5d276cc5045
-DIST firefox-60.5.2esr-mai.xpi 549257 BLAKE2B e959df7f3f06801880efd4001330c77d68668c33b0453d8cc408782a1eb736aee8235447add514cfa905ac71488689abc182e3c575ecfbe9236ea3846fb24789 SHA512 399fe170da8c11cd4cc63c314608c2124f23b597fb421357c5411a0528a9c7105deabc2d476524f0be76a27a40fcd524c5e9b86e8ed35759c9985ef018395341
-DIST firefox-60.5.2esr-mk.xpi 513814 BLAKE2B 66b9ae2d97c199f54a0ea1dcdbef1a41c4e07ffbfaf58fc32570247984e50bd9d42328e4cf42befe4ad56af7342d55755afd2fd99d5bee673f85d799d4ed17e5 SHA512 6b36e5c34c5cbce4d2a27ea139df1da132307e9b8f92d6b3b2e46346caaeb63eec8e4702e13f01399e81eb03676f0af0ed5698c2982b8233f370498893314776
-DIST firefox-60.5.2esr-ml.xpi 598980 BLAKE2B 32d9413d3fe7600721cc3ac0580b92c3c8c4e3f6ec25b5606fc252002983c30f00c5d7c66ba65a89677b49fd87eeebeaf5d92fd38c00e10eebed10a345d39623 SHA512 c3f0673dd45ae3f2ff621163899fd91e99d43fabc5cf561c9c3b69aa46d3b6cfb45bf32149cf0dc139cf16bbcd8d93fc3f33a44d1d4f60bb816b0b4822829caa
-DIST firefox-60.5.2esr-mr.xpi 579118 BLAKE2B 88c2c037be5982b77d8c2750a802bff7a80aaab035101d580e128126b2b8e7712969b1d0bdf12a19255cd0838d269ac7363c940ae51792505419bec6a540450f SHA512 32d0ebc717cc9878fa03e5a5ae0efc923fe0f189b13f5d6d1f85bd20283773af9cae18f2d2bee8205acffa346d6ed921dcf2df76f451ecf7805f51a63e149c61
-DIST firefox-60.5.2esr-ms.xpi 509554 BLAKE2B 70c59669e0141db2eabffd51f3989f9f03370dcaf9c39c2e8223e1023004ed7fbf6aeae414b18e0ef9be5ec95f111c64bff8573bad16d459420ee13e404fcbc9 SHA512 88cc24b9f4aae174ad97dfe0a1f9e0694dbe390f3736a663d1ae0f7bf537034f08edadfb695ce055d1b53594f294c624cb47a0a4d1381c8162bc898fb18ae389
-DIST firefox-60.5.2esr-nb-NO.xpi 509895 BLAKE2B dd171844c400bac9fcf9dfe2b699801eddfc9de7a5e8b1439e102eb6078adff4035250e3b0de6df285b468ca321bd6158685da860feb4128a911e39b875171e3 SHA512 3940cc51ffc3c399201592ed834a1a30a005b1637229e4f7dd9c1aa2783d0efe3f6e300fda5a4386c81cd607c16e0514a9a908696e4ca87e368f2b5957952c85
-DIST firefox-60.5.2esr-nl.xpi 517461 BLAKE2B 5cdbbe151833270dd825a7ec3d1819201c85c26fdf9f09a4ecc50ea4c81b6ed8b07849b2bdc13ffbe2e9956d2b1c61ddcdcd9e8f11258df0c2298a5c0bec2630 SHA512 fdbb7bdaa6b951ad12d2058475e38030c47000ed5ac833cd7edb1521f0bc83d87b27da8e58463068a66393f91cd023cc8677ad1c622e925202f5e53442ab6bca
-DIST firefox-60.5.2esr-nn-NO.xpi 511436 BLAKE2B 8e2a8c8f8666a412f6107961da25bb7aaeb17c35a9b7d009fc632a7a07d94a4d4990364e565060a8be4976a28eb9bdc7e9186b56a1a0a769fb5a91d28a7342f0 SHA512 ad9e36b184eed78975c9b38427750fa8c72056bf3370276d45f3034a8066d618569b063e44c01b7ea4444c7ab77e7134fe855b025f8674b2ab5df7babb9a3835
-DIST firefox-60.5.2esr-or.xpi 540864 BLAKE2B d73d8ad10b0140cff82a76a7111bb8d964f237f2cc3650a697bb1569fedf71f608bf91434fc2eb44db592c886b5aa87641169f277cfe8c400e9c68a80e7e1848 SHA512 1ceff99dffdd7862bf296b0644eda04abf5f0132ab109b004bce3b338bcae3b0205511724dbd53bb9a709aa0d70aed3297906336cf0a908c1cce81cad61a8a73
-DIST firefox-60.5.2esr-pa-IN.xpi 557874 BLAKE2B 2c5b778e977cf4a078d0a2359995b343bdff35e4642a474b5b027a9c6585b2e3d7aa5389eae3bd4599b3769652526f426932fa126ecae547375cac6e8cd3274a SHA512 2cc47ee3f88a69c9169ea5e1c006082795cff02fdd5b11be6966bd5c0bd15da8064554915e21ce9c1e6f578d6b1cdc67c9421118d1140a39fad267c98e738e51
-DIST firefox-60.5.2esr-pl.xpi 419033 BLAKE2B 56ae58957f842c1814ba2bb90b32298c3128a487d6eaa10635a30b383597cdea11c6deb3425bf9143b271ade73e0462c66ca54ec153dc68c521ca67422998810 SHA512 03d2301fba5bade11e507048cf405dc6aebd4d126b7aa7624d69ec1ede8f84e27ee00c1ea07c38959eb85df02e0959255ea0ae219d039d6849931c3dd52e2804
-DIST firefox-60.5.2esr-pt-BR.xpi 514766 BLAKE2B 53842887fb52678ccd216f142c708f77e308c109826d4ea7d048227b58b7119b6888088d9a2138ab249b33125095e33e546b143a104366e45424afa6834ac6d9 SHA512 c24d42ac9c92c88276490346a7420be7b22265c9837f46daf686fcdb91ded73aff90aa19e296314d8882eb152f2b74a0d6194e0810843c47b6adfa99574a38b8
-DIST firefox-60.5.2esr-pt-PT.xpi 519359 BLAKE2B ea84739d5cd721389876fbb10a47adbf03f61b8d1cbf952321661b2c18bd46d0d8ca0671fe3f2ad9ba04a4c11028c717e7395cf7d909b6b54f2ceb1e2efe43b6 SHA512 a5954d9f82cad731a766b6fd12be2b256b20e091616621f143c4f546598b5795f3c592c9a046ba8424fe36f4eaa1c92cae9539d506b1fb262345e9ee0ca51def
-DIST firefox-60.5.2esr-rm.xpi 506047 BLAKE2B 5f77e87ae0740bc2c58dbcebafbd302037406feb682bcd59a99b3da3374f5b41c87f70809e5c1dcaa12cad731f42892603ef009da850ffa029d481b7abece66e SHA512 a4bb45c7130e14eded04058cf8388ff4071fefd03bd9141f7d2c6af5ceb299c53c83634901821ac3686778f32cc0e81461076b9f509e2ce15df85fe6585a51a1
-DIST firefox-60.5.2esr-ro.xpi 514062 BLAKE2B 9f368017286eece822ed91b6238f3c526447a4ed8a516929c24516eef41699ae6c9af5dbd31bad50564d594a01ee50fae95760d4ff0b6bfff0fb4dbd346a59f7 SHA512 d704c07e0cae58c5408b36f8d00dcabb80bedca4b4602ac158c618219b46f940f3edfdd539520f239e8bbdb7be2217478d2158cbfe7eaf90bd330449d7e68b46
-DIST firefox-60.5.2esr-ru.xpi 591401 BLAKE2B 40f959ac6ba9e9a92a012505b8660aa9c02f7c76cefe4cf21f03f8782c44cc8d6e4e2d6fb12df7f8f372ef107822e3c0e7f7642fbd747f8e4d408080e92e1205 SHA512 29d797e23ad89f6a0d5ca21f0faacc5aae5864cad7eccc3ad54210aa30c0f09acf4357b55d27d6f916a75c11513a67918e542365f4e8640f10ae906f3a981bc9
-DIST firefox-60.5.2esr-si.xpi 545575 BLAKE2B e90c6d5e5a2378cfa3912c3dc1be71cd12e5d0c97ed14158a4922aec07e4592aa1e98c11ec3e8671bcd24a1203e189146a8654459b21fc3ec9a5c5b4f039eac5 SHA512 e741ba6ead683e74992b4380077b6610f944aa2ad197df9a7ef37bd6e8b128db51f4cf3a14b7f9029eac23368822fa112fbc05bda565a51023c02a0565c12b16
-DIST firefox-60.5.2esr-sk.xpi 541709 BLAKE2B 7a3e8383a71c32fb169f8d639c4e154bdebe33f27ece313471ddaa2a071ea24625ac211253bf8f8eccdbaddf3e94f90d83fd72dba42a220daeb2f58e995c219b SHA512 ac792d00d615a84b20d7c781e3f95511e812fcf7e2c366f4ef88c4da959e750a266e62fbf2cbbe147d91d5b720eed63a95b234b4b2f0ee9e8fda57bcd7d03fe2
-DIST firefox-60.5.2esr-sl.xpi 519369 BLAKE2B 0857aa62b786c1d422c9facccf0f49d4bdd57bd2d3b4a2f9d00eb1831cf567c03bee0dc13f26677dad9e982fd459893eda0613379659e961389dd7ce76c4fe31 SHA512 b77b3577a5022b017d6200f8e28fc6c7641c7cce6c630aca833f08caa72ff4a42790a2bf72b4b0642757e06b4e2247d8b1158a97a407089e1224f02b72002327
-DIST firefox-60.5.2esr-son.xpi 497703 BLAKE2B 4f5196b8e0e11d68d8fc960de05a2c362ff097cebddd50ed7a80183b38f0cb25bef8c64d858ffafa5c0b941199b5b6cbd9c3b657f6ba94d5deb346acf076ecc4 SHA512 4de9187797948490e01ac6b86246fc7b857a6824d8261f70cc670143fe470ab2a858b5c047e1e1e07124d0d0e6a5deeaccf175ab0c028ffedbcb133d81e35d1a
-DIST firefox-60.5.2esr-sq.xpi 521271 BLAKE2B 4a6991a74871050ff4b183d259c39c8e966850bf76cf43680c6f667981add85fe532ecfef765c5c984fa4a4b1e645f931a392b1f0527257102546c35361895cc SHA512 5b0a03ce43e36f0b53a728a5b1fcb73472b4f64dc7b47d01429179bcaa95816e9462f97b1e58f924947e8b85a00b1e64b83941a0ea4b2c05ac223872757c43f7
-DIST firefox-60.5.2esr-sr.xpi 548776 BLAKE2B b9dc090c98e811b4626ab7a72d9cedf87ae089e2710eb5daaa2e8f76f35590548c9ae9ff9c8910fb38fc0c00b200fa82c8e1ed28e6e398b349d2708534c1d2b5 SHA512 85f9980bf77d6809e6b89c9377c897f7cbb4217df5cb470ea1312d012f066965ffd636f629e9c1fa7486490dbddf00ee2951ef29eb3fd680ee52da246828ac8b
-DIST firefox-60.5.2esr-sv-SE.xpi 518665 BLAKE2B 2dc815efad4ec2cd274c3718a3a0f04df6c59fefc08fa563cfaee9292eaac695417f17593bf1410813698c86f2ab5a9a55959851de3af24a843e31e28cd8ef93 SHA512 e5ab2a5685ec8ded10318e9c5c1b67cbc1498490c042a33dfa741305ede21b09a474b5c0add38eb7d08a349059299603a75c5e3cb09bca1062a376c5108bcb99
-DIST firefox-60.5.2esr-ta.xpi 577925 BLAKE2B 9e475117f07f9760b157105c75ed23ef45dffe90abdf9335085c32df257e0c120ac61d70b7e6098f514ce6a11907fdfe6ac3d99a9fd4b2fd61d51e4fc37e20fb SHA512 f04bf00bfc9b0a2f21129fe67155e1e31f12d35e9bab3c85d18e82fbb5a4da419d4912808137c56fa487a4f9f57846d4df4358cdb382bd855b0fb3a1a1133c4d
-DIST firefox-60.5.2esr-te.xpi 590959 BLAKE2B 6e6abf7b84a39294713f820658cb85ffeb8570fe68336cd8e0e5aeea7754bd5a47cf4cfbb0ef64c3b76b890e24448b098cac25ce9e822ec0d046166e1a295baa SHA512 c519830eb8b6a840b1c4731b3aec05963fd6264889effc338a177ba37544673683de80ae39f31c37b9f5b8acbb2842390495009cfd5a423ffe3a0bc3dab75a43
-DIST firefox-60.5.2esr-th.xpi 562819 BLAKE2B 642dd72300feb42bedea4693ee5ff5b617258bdee129ca4d3bf531a7ef3f3ce480e108168262ec7b6bed0d257e8957bc1a57c6375a335e36a4134dcd333f871b SHA512 c279925028d8702e1d123e666a3b59a60aa6bb0362cd3177c3e49514848682abb6335df271b08386f7d73799b0dea4b2609f03b2c242472daf35200fc9cadd9c
-DIST firefox-60.5.2esr-tr.xpi 525868 BLAKE2B 0e5ca9e19f20b05f466ddbcba4e48fc74c8a577b79da10633e88f4585241bf0c907e91afb58b14f58425ca7dc845d00d09da661fa68ed95945c7ba4cbaaa610e SHA512 f01057ceb15dea8157afdf79660d932dfecda2f99a6bb29fff027932f25988448cf064124a07475f4d23267b1f241f9d7e20a492a43b1f9a4b249c3a36ee3fbe
-DIST firefox-60.5.2esr-uk.xpi 580932 BLAKE2B 275f46f7df50e338f8dddd7c97fba745c5fc2b31dada1a117cbeb66924959b3ee447eadbd6de5c16699388128bb027f97850ca88f5d25849ab11a27822c28aec SHA512 53be4ec229edc67ed626c80c45fe858d855a5fbb8d79fd36b5b93c0617d1d99ccb44d8ea21e5a09955f0d0242a6242920fc07454e7864f358d5d21efbe33a945
-DIST firefox-60.5.2esr-uz.xpi 513691 BLAKE2B f22d04e22286c7a9f4a370487fb24416faca9ffbee05204cac848990ce0f159fd0233f610d0cca99d7b1cd5261d8779ce6776b9f0144e78c8674463f65429cb5 SHA512 5bef2c27e0860cb397741d090f48f9b9cac6b862ff0f6a2d85c24472d69c6ac432cffc50a7cffba972e9c90f973a218c34ad12fa1c568d2a62577251cfaa6200
-DIST firefox-60.5.2esr-vi.xpi 528189 BLAKE2B a0a43dba28e8d6528e259284d2a36bfc071a98dae9205b0ac6e86ddb867475bdcdbac9447665a9b600c03361f0a6e3504bea78ba0f59b096f6880deb7270043b SHA512 ba824edf14ba1e126790a3379123a0fcebbdb86c93a26191ddfff0b8cd07a90ddfb2623b02309cab377619fdf023a2c9aff811ee8aa5cea13ae078e4d9b4a1ba
-DIST firefox-60.5.2esr-xh.xpi 511862 BLAKE2B 8296eb1a3dec00565f6d7d9c0941d6af189d37a8927484a4f4b0474ae373b876bc05c295dd37a75afd515afc0447fd8e347b6ad4b26d11bf32f1864d6f4bf9df SHA512 cc0d66939a0e4dabaa7ffd304b6ec37c0a64fc0cf4fe790c73dffa80136ec83f8c873d4cd2edd84856e7a12b8b7379f2c377f4c11824cc26a46372aaf2c19acf
-DIST firefox-60.5.2esr-zh-CN.xpi 543583 BLAKE2B ab3e8475c24d481b78ddcca79b909f39a4afa652b256f8304a22675660fd511d17d4c96d26557026192b40a3027fd7c9a9acdf3f21feb7477c1f2fef5896342b SHA512 359d20ea6ffaeca20edbeb799446fb506fe3446be6c8428e77b8c1bbf7f7b582ab6f5ced5ec36ca32a7a6f0d917116333834b677f67490c3a6ad96166a31eb83
-DIST firefox-60.5.2esr-zh-TW.xpi 541912 BLAKE2B b0342b11b9de43d40e75961ea4a402e3acceef0e5ff46d3c745a83cf2459a9fbd5d9dc8bac99aeb3bd2af860594c74d89d8ff6120b95a6a03348bda5120c8859 SHA512 f2c0b65afd97a50cf2fc69496d3132343c15754fd22625072516b4039c61660a37877ebbfb6a53a1b3c941901d310dc284a92e0ff010db01ed2e64fcfa6d3637
-DIST firefox-60.5.2esr.source.tar.xz 268056844 BLAKE2B 96191080f9b89fdff3b851acedd63255b3b4daf3f96c8159db14badf5e865e2969bcdf940ace6d5bb9365664d10bbd70fc808d6b9d66539f7c25249942b2b937 SHA512 5be7e5aefcd038b83a6859004042e796fee5adb48d1a010547ba5fb6eb9c69b11267d56ae9f55ea8f9e7859ea8d600fb93e03e3712f6f9c023370b53c0f5efcd
-DIST firefox-60.6-patches-01.tar.xz 14548 BLAKE2B 412059a6db015fff0985e637768426f877b33bb6b649c54f1292780b9d871f8fe9bf8e6b150ec36ab3647b4501fa6aec821c089a5d6fa861402f05e948f1a9d4 SHA512 b97da7a7b65bbf53cb6b9f48fc6c07a32cefa9d4b4a79ce57df047f941f5269e21bf09fa56a5f31bbf757ed2d76f8a1fe01d2306c92d20cab979e0a21f895e64
 DIST firefox-60.6-patches-02.tar.xz 15788 BLAKE2B 1be3fab620fcfa0e59d1ba4519577600e7cec4e1fe285bdce9a70e0c4464cb205850d39f8007b7ea1cb4eb3c019170fb66ec17911fcbaf26c50370a14e9bf087 SHA512 092ccdac1198eb775dc3dab05cd5e852b6b0c5d6557d58e54f86515f876f8ae025d872969331c482cd77317a8813a9f5926ea37d08af9d433246e2b5864d7cea
-DIST firefox-60.6.0esr-ach.xpi 500921 BLAKE2B 8ea6d36be3b1592fe30674537231da071f9356584f97c4ef7f47d9490644a6d00d7a715b9d959e6a8cbe13dfed40c432ae763d6f80dbaee0e830716647d7cbb6 SHA512 4a327f794f0b46fd9bd70f44f638bc394c29444fe31afa0aee331639fd584ac64c5fde3d8c5612ca6dea303d284b16d6ff5cc90250489adc372daf982bd66c34
-DIST firefox-60.6.0esr-af.xpi 491389 BLAKE2B 27fad45680ee4563a298d94064e30bd900a8d05d0b7527ae6cec4d52f33d2ad28685005239f617d5801124c13db71d1088800404b9afaeff5c57c35541c1d991 SHA512 3f5d040c46e5c64333777f34b76efff11e386c628a492470d09f3f98de8295d684f961bb7977fefdd4fbfe88893ba70cad2523a8f1a996dd2d1b79519ae49ada
-DIST firefox-60.6.0esr-an.xpi 524585 BLAKE2B c95aae86e2cdb7fb3f3aaa158210c6b7db0196a61eba8f4d417092a2f21fc4a3c66de62900437f9e735fbecd82d13fcb804b5ce31900060f8bb1f16370b07791 SHA512 41105e0c66906e8f806d9df043d55cc15a442caea62445d9375cce2296403a95eaf88b68cc10806147d952a9eb897205dc2737a8696be987ad676ad63483f3c2
-DIST firefox-60.6.0esr-ar.xpi 551897 BLAKE2B a44c31f3ed54444ccd71b3e5664bc2649a0238c5db1e841bbf8f3acb456306dbdc871936f0469754588b9d5624525dfabda1295497c33f301b3d46145f7527d7 SHA512 51c905d35141132dbb6deec9ca5c4c0ec1c86106b92436160936f09e6dab66e593da022ec3770949872cd98964ecbb312bdbf3463d155392f481e5dc0165f874
-DIST firefox-60.6.0esr-as.xpi 534797 BLAKE2B b9b270cabe9bca0c602dbd2e1d10ce75c9c0708230c779f57a9170f1e6eceff9b95f9cd9d9d2e5df65101e4425dbc778c68c66bc44541f5750d21e49f5597cc9 SHA512 8a9cfeb13c02725a1e5a92ea7010778466e6f945de37d22b59a40093cd41ab6f2dbc5da65ef9c3859eddb3efa6e7902950670f14f5f27341cb352a1c8eab83ea
-DIST firefox-60.6.0esr-ast.xpi 512738 BLAKE2B e7c34bc5bf57a6efd485c73d015d0c23da4ce917f0aa7db6671c4166e7cbee0f846e0845e10bd847e65ab20545d0e44ba7067bdbd580aabc20cc8afdec44aa5f SHA512 2e60e2dc1892509c2f4c69ab6409139360ffe477d77a8480387e14a391bf408e2c57b83c3d24a20de8d89a6cc12d863de6c9c31812b360f84667640612c1f015
-DIST firefox-60.6.0esr-az.xpi 528825 BLAKE2B e3d5102d024f6ecc1fc94485ccc5e6cba2b4c0f6f1821bbd71ca239767b13ae85e06851d72417049dede8eaefd1fcda23df595e578b201a1ce3c70b77e21fbdd SHA512 39c57c06b90127dc35801b9a8f3ab0467aceb52437fc9d8ccd9adda8629570a19b425342f7496d653c0d3480f2b705135cadca8d7162c31d58faac19fdeb718a
-DIST firefox-60.6.0esr-bg.xpi 577918 BLAKE2B 970e346f217cfdffc04b5864b59ddb086a3a98c0d347f2d1515b360b04d2b6ad5a8757a5cb828ff60269efa65cf5723fa9c1af8022e78ae9b7f93d22dd24c225 SHA512 25983fc9450c25b914d98b7a7ca9c0a0d51b15e48b3caba6bb92626325d39d343e2c6b07e5584dd2a84ef068b21ae876227b48ae2782b99930fbb9f794c493fb
-DIST firefox-60.6.0esr-bn-BD.xpi 594513 BLAKE2B aa9ef0d392b1dab8642ee17d6ec3b101cf73e223ebe9f8c166ff9825903bbb547d00f56c8fa1af14098b099cceace0b67f51a96ffdd94d19fc5a6e4ee75fe89e SHA512 4f4b306efae1f0dc8c6a5e4562a249bc2e0513339dafba5d33a5d1ebb9ef8b225127cd68b229f58a56bb2fe80fc23672acf1482e1ade4fed4714f4a89aeebddc
-DIST firefox-60.6.0esr-bn-IN.xpi 574942 BLAKE2B 15a0e4705e5379461aec931416a303d9d38a6c84f74c55166f12ed358442d13d191b5dd95eae6541b39d3c74ee1ab7707be5909904381a5fc74a19adcb94d0a3 SHA512 240f3ea2aedc75b77fcb63dcc759f061c6774b67fe32e1cce55b1eefc1e1901e0e6ac4981d9c7a4c874a46eadb0e0252f37185224b82503d435dd6375f6b5bed
-DIST firefox-60.6.0esr-br.xpi 516116 BLAKE2B 621aafb9a19c40eceda3f4d135bda1e1f7a20c9e76a249b14c289a3fb6f326e9a76b0eeff093e7743ba96a3f92556c39bcb8be406b2cef8abf80a1fa4feb4f39 SHA512 df4f24fa11e3a4741d9ec24d50d445be23ac4f3b14857b2a4d9fa6d1618529ab61100602021993c31aa0e5923a5a4f20b02c841c7dad2032000bad5dfa0fd700
-DIST firefox-60.6.0esr-bs.xpi 518780 BLAKE2B b3d758e9b0f0a1869a8c8a6b1a66e03f9c32bf0ae7841e0fa0215e4ff7ab891531a9934096239ed5ab45f4dfad24d8255e94aa357e91eb9c2850c59254e58ab6 SHA512 cd55e78780e827b3cad26759dccde71728919fa16a7a98a0d936bed465e6426de0dda10b10b0c7450f336efdba48d20406a0adc0c9dc4af2479fa234434c51cd
-DIST firefox-60.6.0esr-ca.xpi 529341 BLAKE2B 1cf5fd4e1eb1c356bea10a5740e096ca87705623d32839b84b6db237071c8b6d0080149253dcc309eab32674e947e458c86dc7d92e313f39e870ba560ebae9ba SHA512 b73e3033bbd545c12247dc282b448c21ff221a993212a062b30ab36f09cbf5c7469b9eacba485d11dcde439423281e74958215359f978b3422d7c4262daa128c
-DIST firefox-60.6.0esr-cak.xpi 540386 BLAKE2B ff31debe4a1f4d43c75f5fe626eb2e222aee4d4c99fd080d22f6f66346ec1f6a52b84abae220ca7ffbc2a790d1dfbf7fbe8b78c7528cd41d22a0adc89ec546b9 SHA512 159f5f148772a19fd14ac26a4210cf0cecd47780b2917f8cd35e82ae892f7827c360b48d0a2f87f7b8b9cec2147917bbeb148591f071bebba4649c753badf434
-DIST firefox-60.6.0esr-cs.xpi 535866 BLAKE2B 3456a0faebbef8ce995203be645c4a1b686312f10e7b5266ea8e0b767fb410691078e8385cae98c22ee59e3606e0ca22cf4823815f0959a9ab881341aec4ebe3 SHA512 4f0787b6193b879af91d1710278d84eeb2fc230ed7beda340616a5923ea4052ac5b252128d20b7f161c38dde507674261fae31f114cbac83c9d15f9d18517937
-DIST firefox-60.6.0esr-cy.xpi 520720 BLAKE2B 3a0967a2ae9dbba57b18f4f40f6a5a9f32f00e614c8d1b3a0e218bec39105ba8d2892ea123a4d13397d7d44d46c698a2512e3d7f1c3cbf1d07b6112bf5543122 SHA512 b769989e87a7b4b2244c9629540de7248a2e31d19586f18cc8a2f0ba664c6befee67ae08f1a207a4d314eb94e6a3f3124e0900da4be33b48b5ad156bba8fee1f
-DIST firefox-60.6.0esr-da.xpi 514834 BLAKE2B 233a46bf8efbc2c2fd96bdce757fba67f8114e3b642a380fd7e7ffb39f87bd5bc0cc201d27b3cb00142f03d03e56d6bd16c2e7a07b10e1058976f1c19120f551 SHA512 831b242fd63137dd057e4feebf747b73edcd68c8012bc212c869e57f29a9dd449db6d1fd53111598ba1cc38310b9fc395cf58b6efd29e5bc3d1de221bf4a13f0
-DIST firefox-60.6.0esr-de.xpi 530596 BLAKE2B ee6e2bc72d7f33a0d0cda81d0a40e0b2f217b14ec09f219e476dfd21af67a4fde6e3d3aceb64770d9d9dc9625a0bc14ff85f98f29b36a5cf3283e8b3260f04c6 SHA512 3a3c24e1dd4526cee868f17e3dbdfe069fe00ec8a0fc938286dde82c7ca1e752dedf28f630787ca3b917d35eb2754f38527212939858354d01af9ed8d255cb4c
-DIST firefox-60.6.0esr-dsb.xpi 543612 BLAKE2B 2d1d34ad20e072169931986a2cbdd02f2bce03ea84d7957cc224c1324d0fb842d080adc188a94c9a7fd3196ff297b01543a4b2ec486ea5589e725f23209a2880 SHA512 16c9fe2000c3f2e0bb185e094db96eeb3f0b2f379b945046973ba91bd0d4bd5975e99cf2fa98a1dabea7bfc47000da0b09d5a7aae912c2146dfd75854d8b01ad
-DIST firefox-60.6.0esr-el.xpi 597777 BLAKE2B cbb9758db1121a4a7d212415a6222960e085c136b1bbce1abe2a31d589d4da00dd2146a8e3fa8bdaf928cb40a7c76022bb548e342bac83696c3557b738f1fcb5 SHA512 21146c0d6b6b971b4e4366531a725a6049c4f496ee377e635f261c74f31bfb406d50d0d4c34adeb61bec8fb0728e61334a8030abab2d4cec30bd7ea09dbb7a9b
-DIST firefox-60.6.0esr-en-GB.xpi 495775 BLAKE2B 1287db5cc3c6f10c5aeeeaab3000635300384be25ea18f12d258f384e040c071625f433e6cd1ca14ccd6fae8135bb81a1f44f3f77aa8dc9c43c89aca7bbce58f SHA512 3396739f489ea280c699114228dab1b706f5f91019489948d3b38f2362f71390f59cbf150dbf617930c34d6ba4ff5f01311bbd5f81e5c4b46968214108e78396
-DIST firefox-60.6.0esr-en-ZA.xpi 478761 BLAKE2B 9ca8c69691cef932d81af08f9f65f8ea6359dc8318c9a24aa733d5807f289cb1f1c3ffbdcc9acb4a90ee0f43299343f5d600f2f76f937559a63a7f73a17f0386 SHA512 67f3187eb5e63fd91153e3a2ccd8f22ea8adcfcb5410f4104448941d691b0ad912783b173e094a1b78b9e3c823749f9012a128214ba03b5568abb71fd0128df1
-DIST firefox-60.6.0esr-eo.xpi 515333 BLAKE2B b8cb0153d3540ec4009676bada5ff3605f0e0a8a878b29dedf905170b513165cd32399f728c2834c9727b184a94d01e78ece56c92c6b684ed7a956d2d36a9b94 SHA512 aa2611cb83c89857d6f0ddf6ea95d3672abeaa773e50e4219210b660657386db0599b01499d837d13acec26de672eea7dd28d97294828015d9be9674c6f0e969
-DIST firefox-60.6.0esr-es-AR.xpi 528733 BLAKE2B ebe6b6cb713fec1a13effe4f51b58d639be6a550204958ba8623fe2a0608a0a986d3a7f1f12e67033d733c010fea41553e6123feb24fdae698136830159a30b9 SHA512 cb641e78d46e98a6c4a55c5901be76b4cb7430b78925cb502f89f0df388eb22d46e8b278045f5fa99cf2d8eb5c89630be3cef59fc58170e5e748849b586d4f38
-DIST firefox-60.6.0esr-es-CL.xpi 531421 BLAKE2B a1045704b8a546bafe3ea3523d61b6f5d8d8eb869a47fb4a0a57ac2940b055792720baa161e023729ec5564c05c5e57caf848cce6848cb5905c2f8e6b65e677d SHA512 109bd544f1898909a7f001ae3b2aec92dcdd96c3250928e9367b33c602471de3138822f396334b12e57587a13dca27a4c43e4d7095845c00ebb50722f2807dbf
-DIST firefox-60.6.0esr-es-ES.xpi 464059 BLAKE2B eec6077f0b2015a623d38c11b1300e16a4678d5ee3e19cad1ca6261c28789e0527c6c73eead0eb233ba31ce2749fbab55731e37639fc23d7140c53895e38d571 SHA512 095d48dbe3f78e6aea208c1e6ed8b46973c08a632e4f8dc002f1b839fd2a20d4a4b2552311bf0664fd6c2a36339635995a4e2acbf84d33c5d80141c087d0c3d2
-DIST firefox-60.6.0esr-es-MX.xpi 532743 BLAKE2B d3a326969c5f61cce125d187a64020214145bf6cebccacf2a22eb151b8d06db545baf503be5d5a124ea90d93c700799b93b6e9e26c544f9ec49fd8a6b8c40a2a SHA512 71bddddb1c4329bcb3437acfbecfea432ee4e5841a1e17e55da59290da88010dcee5f9ddbd425af07cfacaea8647a6d7c2887b0b8558536c4c15bb3ff6bb4922
-DIST firefox-60.6.0esr-et.xpi 509041 BLAKE2B 15ce36045e9e31523ecdbffa352d73f51f5952e9beb79a7ce687c34c493f59e495a7fb427de254ff237ddef6e85085da9dbe34aa98bc33cb190aff0a9cb7b294 SHA512 e4c14bd1a3cde62549a2c689b1780c857c1e8e75e0fb1e7fcf3e9feea794733184613d821c303c7674b0a4a40d2d71f726418443a017ef4b8bce77f6611a5e45
-DIST firefox-60.6.0esr-eu.xpi 515784 BLAKE2B 0507ba137a8e53b1132dd0e8fa1135facaa07c2c63080bdbc0a90a5bb719c455238e662bdd894a6a91ddc817637c5b7729130b899c2b1e1e6bfbafaa8f13b071 SHA512 6cf51dbe480aadb6570ae84d21b04527c50355e1e19239bbbe392ea38bb260c1acafd12999e6748dccd68bdae49ddc5e9de310929279b97fbefec7f7649b72b4
-DIST firefox-60.6.0esr-fa.xpi 570346 BLAKE2B cb5a33068fe8b98bac5cfbb9c51a173151cedeeec2461d1f96bbd31cd7e501b3f300a5d12688dec8668e2ac7d46180335729edcc3f2a53c0626c2edd61a3c4d3 SHA512 95c0d022c66ef61629bcab2d92fd69c8949a59d07907f4e73998ae89104a5832f7507973f9a3aed86f88ed490e3bf817b977daea6f309df12914180448b79ce1
-DIST firefox-60.6.0esr-ff.xpi 516278 BLAKE2B 4ed0e8e198eb46675326cf205099804319115b39758a20c61e33d79ac60a893459989f0780c136243c53fe63dd66cafa79faf32abe7365e315935986caded9df SHA512 9d55d0e842fbb37f735f8ba6f1d928e42b05dfb9a0d823ab9718fd57ef8d920302befe02273bbf1cd8b32219e7089920f4e59dde223e06e18153e2ad711afce3
-DIST firefox-60.6.0esr-fi.xpi 510261 BLAKE2B 2fef74c9cc9dba86468fa9f5e5ddd1fac32bd3bf67b62a2e637ea63181e637562300383bf442b9aecd3243f8f9d418227b4278583708b8ed6056a5b426ba0a6e SHA512 bc7cd72f79653070d6528a2a07b3d7a09ad265f09c7ec0f3361c711ba30268f1fe9ad4c53d19d927d950be1a6c815591029dff75fb150fa33487bca17b82f13f
-DIST firefox-60.6.0esr-fr.xpi 540155 BLAKE2B 338dc941d17fa6387c80c8e2cec8743e6ea324c7c4af7111430472cb0f7b109328c0cf47b6dd8373fb839c83ff81506413ac4d953a5e7f4b1bbba2777120467c SHA512 92d7ba82eccf31b073e37a9b7cb61e142f2857604adf226393ab6d65dee0643fe153ebf089e04ab0b0729854dbfe3431f3ab1b25951001a368a5e1eb54e1f8f8
-DIST firefox-60.6.0esr-fy-NL.xpi 528608 BLAKE2B f21f15a72b0ca339274128376c63ede5c006bce5a7d5d4c84988785ac52b67c0dc0432c8e3f58fe119b01da1874239164f629cddffebf91864f1777bb18c5e7c SHA512 7384a7a3544375b57eaaad7ec02b763f423e7be2db7493d44c62879306850514ecf7f043159744c6fdae079d57493fefd59541c3965c56a346ad0bbbf5b15059
-DIST firefox-60.6.0esr-ga-IE.xpi 531071 BLAKE2B 042f0a39dc454d20b1b5b5c9bb1c94b2394c157a22b097d72ef37cbc3fb14805cebb7b9f14842ba29ae782e4d32a80d52e5541616eaf33143f66382f477fa10c SHA512 c66abfc633b238989ed43999ccf4a3b314ec4ea7c223b3fec6ac16f954a83bd4981d7122081779562b90c4771d8b70ddf2b53a2f78cb958be5d00f7fdc08f97a
-DIST firefox-60.6.0esr-gd.xpi 524938 BLAKE2B 4e216b7c8875baef763a500082e7b9bd50607582f8ae999349aadf298873f0b05644edd8295de3d2ed09885dc3b5235f53039dba76c40d0bec6dca70fcfa2aa6 SHA512 905f8b313b15da17ac5996a07611459421b42d7fd5f7201d5b10eb84a5e691fd38071b647d5358b1a0aea33e3c5fcee5a43d47647ec3e09bb7b6837558ca3fb2
-DIST firefox-60.6.0esr-gl.xpi 501447 BLAKE2B 2714c75f4065662e390bfe064839c2c21f4099d452a9ac66197dc8bdcf718f790a21a8eb42c4e2e613301e7df04cf8d7f62dcacd183357ed61a854f7177a48ca SHA512 55af8b473020b040a10145d70d5e5b9bfef7234442d1f75cb856b8f30d3e6cf3ce9776badb47ed319d3669fdcef07c06c1fdd3ce562e13902592dd8f331a880c
-DIST firefox-60.6.0esr-gn.xpi 537289 BLAKE2B ab5220c887ee1c7d1caed3e4e97dac9101eb6085c0996d4fcc3564dc63694f37db90c9ecaf08f01bc4cca9ec192d3947f5b6c338ca9e7bcfd886708fc054ad90 SHA512 86028e10a4e747a8b3f30a44eb2dd6213ffa6e45916ddaa03ff34ed63f7e352d8967566f7518f22cad39010089f947a0e593e076567a8635f48e416ee1420ba5
-DIST firefox-60.6.0esr-gu-IN.xpi 594366 BLAKE2B 614d3fb1fc7bb635df1f4f4af35fd720ae141f1148355e62e5ca9173e8a5e9ea5451cd8f3fec0ea678743c7571ec0c1dbe214c27b8d757c4249df77df04e5706 SHA512 4d79e59fc76035cffc4f9805a21193b99596cd55de4748138f38c8236fe145623b1a18ca3a45dc11f697329b56ffb005f29f3facbab74fe18ac702c106910694
-DIST firefox-60.6.0esr-he.xpi 540060 BLAKE2B bed8fbb8fcde0e26eba138a72dd5f5ee72cd6569ba19ad3f4989b7537aec7404b60d8ad7aa7e514c1ca8f4431db6c85a51d16f6af3631c86014957d71905c6f3 SHA512 fec6300b1983ba8b8dda56cf01905af6d4fb0429d3eb36f56f49b8045af6956fe282b4ff3c560524ceb0e77a1a8ae34c3045fdfdc22ef9272bc6f81673e46c14
-DIST firefox-60.6.0esr-hi-IN.xpi 594952 BLAKE2B 6a91eef2d608963dde56ae74e814b235474bf7fd407a064e04f2615801bc399515aca9ebaebd819c3406b2f10dd1675cbad193f363edfce1e0da9cdb85494941 SHA512 1f26a45bb25adfe2d4f3a7d026fd8c0ea565d6f020f483b487b934bb404333099623abf23583f55d1d0827a43af798571a14b099578de875eee47d378bbb585b
-DIST firefox-60.6.0esr-hr.xpi 520034 BLAKE2B f30fccd7794878e223f5d38cd437e98c2f50c6ce1818042483c2d58760b7f0d1f8c51aeaf5f479e768336a0a088b7baa0fb19d5644eb4bcddb533ff2f06842d2 SHA512 2baeba1508d6e01f8aa0516ef6cb56b298ba1dbaa464c59e14cbbd93dcd08c8473cff8d9730dbd92be3a2ff22122fb73f6d7217b7692a438503d246b5f4b2963
-DIST firefox-60.6.0esr-hsb.xpi 541147 BLAKE2B 8274e66cde84aa14db42410c9750f900c6e309c53ba3344ef4f5d602801b2cf337d49d7c4342b825220fc0d54fc4753236599656f93df076f3d47e0cea8f3daf SHA512 36a0ff95f7ae26210e7d20cf143cf2aa339d7dea6b0a5d130a7f43b4e323c199a98b749dbe43969510f185e51f0ab324f872c9629a525d6d74c92073dddd2671
-DIST firefox-60.6.0esr-hu.xpi 542494 BLAKE2B a16c64bb45bafb48051853c2424c80c5beec1adf41893c3f247a7cb75cb11f90f0b4c27c9476ea669916b139b856afcb4a933fc05017def624748ef8d823dffe SHA512 42a0ee45acf31c7a2cfec79eda5f8241fafa54183182fa7df9488ff11213bb356f9cd53ceefa917ae49ff699e4a91c842b7172880b073661afa770b0c2083a2b
-DIST firefox-60.6.0esr-hy-AM.xpi 573521 BLAKE2B 5176211a90469bb67f35be6b78d6c994f44a429ac1dfe345890ebfb566ed3de28c50ca8c94ff8a478a27878c8c35830d67bbdd77c9ce522db23f7621060c8505 SHA512 577f162a322eecc5226dde1fea9711f01a800397aedef670ddc456dbec47ac09fff0e39fceffdc76c2643b88f09dbc36aad3395c86a35580353cd1238fb49b04
-DIST firefox-60.6.0esr-id.xpi 506295 BLAKE2B 5d3ac7a122530aa8d53299a4441105366710425fc7d769c5634f39137b237669f2ec93eb4d06c9082182a5aad1e98e661223e866f3b0c1d55d902718542ca05e SHA512 97dc761125487ac750b09f48113016207b0c14d8a90612effdb394927c57f5e655eedd87b42107414b7b38a1c2a8236a5f6a0bcac5319b5d6fe32e2adc7f0d73
-DIST firefox-60.6.0esr-is.xpi 517351 BLAKE2B 2e41efe5d6f9abf9f91aecd702401fa8b01cb809f979efd37b0a41137b5b234b9f46eadc15665c9e335d6493d270f5d23a8bc793d6d307b3e23f8583d9f6e488 SHA512 576b8e64255ea22bfe9a07e5c88437187401d7d1e17b25da09de32f2274d19b5754ed338a864e7c15421d7c53d559e893167da88feaf5e718c0ec0294a7fc287
-DIST firefox-60.6.0esr-it.xpi 403175 BLAKE2B 8d65b1cb5f1437977fae3da173f2c7b542bd7809ad7791f7d11a2c055006c0a6ed25c860c80278b297a13d9c21b3ffe6a86f2fc9451d21a48f6ec5d6c2e73540 SHA512 b42894f6e8ef2334ec0c5e81876fe1f2436725f788eff4288d11489cf603f7f9483c7f34ccb866a2de4e565c4fd68c2457844d19735a9450ef9b9648885c1159
-DIST firefox-60.6.0esr-ja.xpi 576094 BLAKE2B 742b213a975f512dd99e81c5305c223fdcc58b40e8a6c6cd7332f08cadcb0161b861338206c291b3c7fb82cc1a8a1e87aa7c981786103db46394e080abae8a71 SHA512 6f68187c57c3f4f78233c374ffcf0e53a03ed148464326ca1cfd1666086064fed6c5d91e0ee1a40c722f8db01a2d26326ae12fb25cbfa77c44df17008b0db07a
-DIST firefox-60.6.0esr-ka.xpi 560918 BLAKE2B baa581d55dc1649d6446193bba9aa22c6f40affcb8e370761595c2465c2a8f3e4786d8d5b706ca4ade1d6a6b801ad1cebe719ac996cbca346b175f3f1463fd53 SHA512 131a191658aca64164d1d3994f454b955d2cafe6a7de3533e9118b8b87d33883e011c9e1a24f3ac0268cf0c4d6ffcc529497548b158e3eba80b463bb0c4080b3
-DIST firefox-60.6.0esr-kab.xpi 524482 BLAKE2B fa06623f718e6c35ac28edca8b8358cbcddce7b91efdcac14f61b8008eeb861d78ac350b4b417c67c50965e5e6088f98b1520ec4f8dcefb1754ba9fafd03f52e SHA512 01afd85a83c2d3c75eee051f5cbdba173dc18b61d26368651f0e5c4c4fa8b3ee675deb1b929790e9e31d32969ea9036a8f39943c86b1f9e9806d9009088e6710
-DIST firefox-60.6.0esr-kk.xpi 587050 BLAKE2B 115160ffa9972295e3bb71f643b5d8a41d5de6ee7901319082e8b71984b730e37a376d5c2b9432484fc3ae70d08a5d587a6d691bab6aa9b3be0437d868ad0650 SHA512 15202d372673a636064c8750deba2c42b751965f574b944632f0fb88e6cf3f80c6ac99637a376cb240ac3f53576ceaffc83d0deaab2ddfbff5164602686cee74
-DIST firefox-60.6.0esr-km.xpi 587174 BLAKE2B e53266002a37ac3dfe5a9933fce8dffe8a3383a7ea39273ae3e9014abd571b3a99383c504548dee684594bb55e17c19f886402a3d3d6f4e01c95139810c84ea6 SHA512 e0694be4f2b2e41717d03e26e4b223625305e1ba515b0dca6f8af9dc3e61c2063b512491d8e05b8bce266d8d02e8248570c58d84dcbd59130ce31bca9842a591
-DIST firefox-60.6.0esr-kn.xpi 589939 BLAKE2B 80135dd61d49d19594f85f44ea04f5037745a43d356fe42cc478e8d9eee84e97445f1b6738bff9c536f56383e5b9c695bcb359adebdd4ab5748a47cb9a66214b SHA512 03b39e79cb18d6c69e0990fc5b81723df6060a842a16ef7d89029e6bc4770a50d8bb2ec65840104784cd0a1ff0af92127845ce013b40775625bb42f43ff0fac0
-DIST firefox-60.6.0esr-ko.xpi 551904 BLAKE2B ab825472fd6a84abb0e9b98f1cb4c6ffb2a22040e22606820de986451c85edc01e227d25fba479b396ab92ad1b8dd5f5e7f27f5e3dc7fd33f6e3673e0ec651b3 SHA512 85e1ab001cf51c6c41cbbb3a2867a7e8cf94bff8189348bf2536cc54f5a41876855bb95fb58d4fd82b3398c42eb194bf2f1b1f33e5e1e8f510326cf948891e97
-DIST firefox-60.6.0esr-lij.xpi 517257 BLAKE2B 0011b1227d16b19df4f9f397994f6bc1738b2b9961ddaade6fb7b6475fe327509f9fe7befd3271ff91822221af4270e97e6f7f17c4dc5bf9284eb2ac7e61f27e SHA512 ae1c3d4d74c89878a4c78a6ee0082b8512aea2d235ccfddfec06d0a9a352564cd39fcb177f56337df50c7ef914dabd31c88cf3a99dfd6447ed66c1cbeb8dadc2
-DIST firefox-60.6.0esr-lt.xpi 540533 BLAKE2B f6c115aaefdb8b62e9f866955ef8ad8f52dced6014bec8656817ef757b9cad7ff3c1737d7469f597ff1f4e195460d7fbee57cb2bfb27df1a990c14b044461955 SHA512 39bd0e209d2a42e8148a30271661a10249480a0724a5cb354dc940ffd973af148c01934cff7a0e239c8db98955f6447a2cdecb5037c69a9dabdf3f67cf23830d
-DIST firefox-60.6.0esr-lv.xpi 530480 BLAKE2B cd79bf90b03c8ef257b362e34ed2f61c6a02d3fcb02b632e5a8d3a6b9a4e6e54b658e9e4f32d2628479447fee74b667327cbe4f161b7457f5981a4546c601f99 SHA512 5194b05c5350e05376e8e5e75b7297aec5a0b2e6f4657adba4442abfaaa75d27227d6f48a324e87f8f94e7421a9e35412493a52dfad9acb47b0c53f173288fdb
-DIST firefox-60.6.0esr-mai.xpi 553327 BLAKE2B a7c776d0193f416fc9f02b800012ea08825a51fea61d64919c4a5e03a76defda388b5922bca5b7ebc25b7541ff4298b0793f4aee7b7ad9cea7338c5c29428598 SHA512 310ee397cda1bde2b87cc14fed404eab9774899c610a77c9a6b87244e07d65d0d42dde77de586f94f60fc8e54d65f1c85dc27421fa355a728af0373053f906f8
-DIST firefox-60.6.0esr-mk.xpi 517866 BLAKE2B a0c4a3f85ed79e1707c211c3c7b607e229b0cecaff5c79b333568270e502e6a995bee4ed114ce45432d3ef7e64cd3cd3c5e4d7db07a607d30af19f61aa79a604 SHA512 7461d331f73c1e4afe5b6c87c9682eedd0706ac27ac5a9dac1d3d5aad27ebb33bd4029580c7574769b82daa2ea4b42a84b2ecb5b0b2cfa95f75f4c33a11ca009
-DIST firefox-60.6.0esr-ml.xpi 603044 BLAKE2B d27acae3d38d69b37ff025e583556fe78d692664423f741cc3d03f7315e5c2572d561733f598a792d75179b81069b4e2184b23fa4e3c5e181a0bd42c1ff980b2 SHA512 19de11ef0c0290d7ea974f2b0100374e5395ef5cea0619b82664ab953c4888cc7b96d3cf0e5292224f7eaad25f65bc6b7e2db75570153e6afec503341d1c68b1
-DIST firefox-60.6.0esr-mr.xpi 583188 BLAKE2B b1ee1ef8e18e9e39af245f0b58cd85248aa26a88fe21d77617312e5563aae814e89ee9663006d81ea2d37353c5a95c111824694181e85743136c92af6f8550e7 SHA512 160dc5cc6b678efb617125ca5cad69c3d58555f76820da5fb513815ec715d62bb46140530bbe89ce69a0c924e259d84a7d5bc4525cafbd0a5c88545e07ad0884
-DIST firefox-60.6.0esr-ms.xpi 513630 BLAKE2B da2e138a75496023a5ccf8f551f2c32523caf331637cbc1ac21fa97fa18d811c3039a684f2ea47cdbd892dbb985ce766e9b6937e5e21acc15d1dc16ab623fde6 SHA512 931f37ab83f7399d33335c8fc9a8d28940ff66e71edaef131dad3a87eac3d1768cab70f7231506a2c1ffaf43e0a4496833969ed4bc429b666590975c5b12cd8b
-DIST firefox-60.6.0esr-nb-NO.xpi 513976 BLAKE2B 3c6f2e2c7930c999c0b682995c2218750299c9ddea304210ef545bdad8d02a36587eec5d75d04ceb25acdc64d1851ebd2dc9e5e22b769c6025fb4239eddf2ff0 SHA512 c8adefcb836ae94d617771128abd82a3a812d531b7931fd91f47abf17294feabcd87b705fa414f96c3854edce908ffcc1b9459d417f796cf2338868466019686
-DIST firefox-60.6.0esr-nl.xpi 521538 BLAKE2B a46036d21c2e76d6d6d24aa1dd1854061002d4034633a857042777ea8a4e1c9244740424e6f66e5873a58fa90add791e1661ec99f05494a2011796b0788bf292 SHA512 67eec86e48c5af601aeec689b2b077a76899d180ad6fc82815afb164a155fa533660f433b4823a30a59c3a99c3f3b173ff492512098a4aae4d75bf13f17db717
-DIST firefox-60.6.0esr-nn-NO.xpi 515525 BLAKE2B 79ea8408cfecbc98ee26ea76e7ff9819fe0d1123ecc7e54ce5c1b44a0b4bb98b1815210fa30cb333aecc7997fa872456fb9e29e62eea89a5fad4c4c18c6aaa57 SHA512 2e55e40e6d8502e3f9d479f39bcc7845a40ea8077a26a75f65075ec33e504c52d936dfb5ab0004ae85383f21457e7685848289ca2067a6d46e6f05be9170eb2c
-DIST firefox-60.6.0esr-or.xpi 544935 BLAKE2B 27a1daf780dfc4e1476195fee284b48f513ffd8326507dd478795fc8605ae892f9c76d25a23229621841b6203f0bf5aa736e3ed3c4f08602c9901be6a92a8032 SHA512 13fe0005066ea232fa2f994c2a49f3ac44c27e06762f57406b9bd4d0fcc2a7a9d1b2aa7cde020c0d64973abe5d16cef578d08fbf73e43df7d5012135a61be665
-DIST firefox-60.6.0esr-pa-IN.xpi 561966 BLAKE2B 21436633717cda5c26f663dc9a28ec3ea401e6d766ce5fb4f71d60ecf9108ded4eef378205c029516c87aae512f067965539c27c5577030268cdf2f4cb86427b SHA512 7acebfdbe80c252268506e44bd3c1166218ef292e95ee9883434e8b0564606353e7c22aeea81e30404a538cf4cb6205f028dd88c2069f52704f8c6c8bf89461b
-DIST firefox-60.6.0esr-pl.xpi 423097 BLAKE2B ec2403418bed9e5dbc0712770a18af175376b56542c4aa25e335e884c270a1367659f0d857bd009e25a94ff8459052fa3f99280e272d77224d111168444fb0a9 SHA512 909bcc1eafaabcfdc5ca3dd2df25cb93e4fb1e1c27a2de6de6c907ab91bc1deb814c944a4befa696f1e22d9e8374bec6394ebb02a6a1c9153c261a3c017cacba
-DIST firefox-60.6.0esr-pt-BR.xpi 518846 BLAKE2B 82d18156611a9555db8a9c15a8c3f5bbb503c2802df3bade29897a2c72aa7299a63b8f1060e6713353592afe3f21f4005fc25aa3989de5baa66b0c91d1330f81 SHA512 25b0606024112af2e0849db1de3d074fee8e4140e3b72cc786e8ba23dd77e30954ad9892ea32cd5706f71503c7928e6bd85dbeb67ab2f00ee20d867d645b001f
-DIST firefox-60.6.0esr-pt-PT.xpi 523449 BLAKE2B 105a09c7bf028c954a3e52e073f3e65a133c2f0a21235dc1c58262e425a302ac93e9ee84cc863f4fb0eac50c7f92fb77ce1d4868155447e10e0cb8b170e60c08 SHA512 46f795b1be4059198035237c661780724b84a60d4427642f79f97960a199776c8ffe42df1196039137a0d3ce5804f6e638b10f8a3907aed0d9931a70a583b05d
-DIST firefox-60.6.0esr-rm.xpi 510109 BLAKE2B af2b894be991247b954679e84684a49450d6dfcee7553449ddbd15350b257a9fced9293edbe8b81a32bd3ad5d7eb29fa4ed503d510eb32c1bfaf05562e6181de SHA512 351edc22ca268e2541d9ba65020da8c90f5708db47431860fa1ae023d0dac4091087971aed36300c958062cb1c21c0b4cb91075ff36d245bddf8f8a4b94439c3
-DIST firefox-60.6.0esr-ro.xpi 518134 BLAKE2B 6205676afba12f93247ee351e8a9c121da914d77763efb95c461953907f7f2f487450a31f638db9a0be3affc4f4a7ec68e0a1745f40a86dcaba1b815422499a1 SHA512 16c4db4663aaf0f192a61d82575fedc0ad4bd2d618fc51e5ff8551dff88acdbc8cd6467fb8515cf4231719ba135abcccd8c1d2ac57bdbb8dfe256eb253c65f26
-DIST firefox-60.6.0esr-ru.xpi 595474 BLAKE2B e57966bfa6b36488cf57c610e980969206d5390f42d177242794ad0c8ebeb2ccd6e8eaa3bd80a59397786aaeeea415924c9f15fea57fcbb5ab9424d4d51d3966 SHA512 46ddf53e09c258a14dfa84d86e13561a931ff1b139ebdf579ccb6c1ff508ee31ffb6ca20d27e100cbd10613ab54fc78445cb8a92486e9d5c3ba113d66a626216
-DIST firefox-60.6.0esr-si.xpi 549644 BLAKE2B 7f9e8667a43333d337f6471ea1e23ed30ca33c691e62e35fc7bcbbe9b73a1996a0de19d2158889d21d527b9eb2901701511c528d8105f5057aff365abd806ce8 SHA512 b03a1da2dd1a4d1b276035b0a091cb7fbe5ac65bfa3b01fe166ce9b4b8810c5ccb2efea017498b2e3ca08177e6ae773e58465a6fc6f890f7fc77b428cc59919e
-DIST firefox-60.6.0esr-sk.xpi 545782 BLAKE2B deb1f5a51a1e058b75765326a8d6f7a264919a8702c323a17dbc2d89ccba33dda0f92e905351b6419affccdbd594729ad6fe76e268fd105d7301b5fb5b83eb0b SHA512 32ad7da7a7365716b7c7855521b1773734f81db1fad24475ea185d8ba0558535ba01e7714896e2ca9ec5ebd1fa0ce4c3b853012a33f708b9a6be88e5e8ad992b
-DIST firefox-60.6.0esr-sl.xpi 523438 BLAKE2B 6fb15cb275529d3156b2646f9c2f22d6cc5b28ffa2c0de7f68dd9125f4539ba55bf8ae791837eb17931e53d8ef226c2b6bcd6fdb506a231c1f2f2da854be7f22 SHA512 c1194c0169e80c7ddcae889812c66e56fbfe7975ede4b5cd2cecbed9e960bcb7d24f850854ed20f3fc0372fe5bc8f69266c2e5314ab948b4d1fd0f019f48fbf1
-DIST firefox-60.6.0esr-son.xpi 501779 BLAKE2B 7624949826685a360488ca8b8ef16ea72c2d8c76c72072a48384e35521a1eeaf2d032cd0a39d6a3bfb01c4532065d969b37eeef678c1726ba286bc9a8bdeefda SHA512 954c68ef9dcbebddeb3773c2f7a1322b3d4a203288256bfb01b7494e15b896d1e193ce06ef9bec4b51add85957c2d0f8676c5bfe5a0db7ef960dacffeaad6194
-DIST firefox-60.6.0esr-sq.xpi 525336 BLAKE2B 1ece2074747a12b5ca6d36dba41241ad3e1dad9adf2f612aec3b57fc939e632c8b5988c5d1e07988541469da95392a1b843ecf90f2bbf8e245f15456c78e00df SHA512 43e73b272d6c72e2ee9d836179a74a278cba83f3ab59a387c851084c8dff474b19b1998c71e42ab5d81bce39c435cdac88febe668a6aa2441a2760582a5f8e10
-DIST firefox-60.6.0esr-sr.xpi 552850 BLAKE2B 9bb4eb2dc213a938d45b86f081bcc6b59840d75aac2df264dbe887fc294dae939dcb1a77e097097dd3590fb6ae3a9927d68fa4cfc435d5ff37035ca6f8b5ed0c SHA512 d6d8c929d1becee8c5b61e0a6554745835ff729518f65d5568de82c3a65df65aefc5b073caf200d09b62e1600e694b40b3362f1c0300b43e27da0096add76c60
-DIST firefox-60.6.0esr-sv-SE.xpi 522753 BLAKE2B 685aae276328aba56b48b2468f005012260e8a5842f13bba4eea59383a6b9639565404e2d10fec8524b6aee1ff4126d7ec6b6ed2784523b93de22d072da6f152 SHA512 40aa68393d50d466b02f16c1a97259ce9ba1d8b85b8089b95d757a9f6bfbf20c0fff03280ac4fbb67c68d8a737906258c97f755f13d9661ced37090e41e2f7d7
-DIST firefox-60.6.0esr-ta.xpi 581988 BLAKE2B ec9fb70eace97b87e28b4023868423e48fc44674cf0c96a94150716c49e5138bb482ae20cec677e23339de86cff1c626141e62387a309d8aae38e5f20bfacd68 SHA512 c95d69f5ef8a25dfd38ee1c017d5a6ad32fa40da898765d19356ec19f4a57a4e41038c8d3ba73de64dca1cbab8528794d74365e0e48d234e49c2c202fd8f1389
-DIST firefox-60.6.0esr-te.xpi 595040 BLAKE2B fdc9c241f464c92d09edd1f32cda91670aa32c63844489ae884218bc72db0a2612b62f32eab873d53114746fd30ecb17012afa3936e1ddad46b989b90d760098 SHA512 1a2dd54c3ee6b1c2e38d876f1fb9d9dac3beb6fe8bae34682bfb26307d8fe72a978bd778eaacf62cce6b14a2c748bf49859c8a41b60091286aef29c0a22fab38
-DIST firefox-60.6.0esr-th.xpi 566887 BLAKE2B e5b71cee2685ece367507152d7db56a248ef641ff15809018407662cf0da65a079e0921d46f41bf081862b3e9f1dadf2eba4225c59839f79952f9c459bd66ed3 SHA512 6c356ffd721c9b36d56febc4d2d8c8df0d277121e76e3e8330735b142c45707f9d71ed4ae1f2996142942ce40d9f0a8f77d82b17791c529101009a496e20e2a9
-DIST firefox-60.6.0esr-tr.xpi 529935 BLAKE2B 29f0155fe2e6e69e24bc1c95b7f3428374731d09e6079b498aaf04b8476ed344a7726cf297e991918e149c14584e4bd15224d0e32be5816de6bbd05a4213ca52 SHA512 2d59da4415e954deece7caa74e92cc1699258072a6b56c1a3697252f8b9bec5030ce1d7509aa73410d42e00d3f69ae1af6898ec4a3df58132fda6ca7cd284706
-DIST firefox-60.6.0esr-uk.xpi 585000 BLAKE2B b9c28d88714b25d5a792aec4763f0103ebfa3e763c354620d5267ee3791d6be7422749050966aa3956856beafe5a81f5ae62e5c99ad9ac9a6aef9e31773a3a20 SHA512 8861a15b1cb8796377b64cfc3573b4255d0289f6e4015a42b074003995046d4dfa95d57305ed388dbba5922e022d314820b9943acb7e505d156215c3ee98a92d
-DIST firefox-60.6.0esr-uz.xpi 517756 BLAKE2B 6e94df4b2a48ae748bf1a3d79950d35dc1305025f76901c73e7a1dac92924efd45cb62247604720ccbaad48ca3f8e0ab0d5b474d7f61f193c4d83991588e14cd SHA512 e66d51341bf04476ad80894525c1be9f425ac6455ab4f9ef1887a81e23cce9fa7cf8a18819cdeb6ca87c82275530af98b875797bc2ebc2b05a348a488f278ca2
-DIST firefox-60.6.0esr-vi.xpi 532266 BLAKE2B 001614e36cc1c9c4ea0e246a9e19700d7cdd780a4aace80fb0f7cb2dcaed2520ba80e161a57124aabefe58aa6f7105a4fb106c8ec48855e8e45d748bde0eed37 SHA512 3c3b4a234cb7f5de2bec552f70a72fdb668310b4c4422358536e18bdd6b203d179ff6a9774522ae0f8a9a2aed0cee16a8a91285f7eaa6e09b7d5c29c86b01841
-DIST firefox-60.6.0esr-xh.xpi 515905 BLAKE2B 94af79f309845df9d3b1875b1a8c6ca0732cccba84041871246e1aa5633dc0ff34916c4a1c3366d8e948cfe1acf164aebc0a2a7fabfe6f46c3340d3622d73542 SHA512 e746958409cc7832ccacd46aca2c8508cb829785588bd4cee9836be2f8645c9418756a5a22e241f636f1136ce726ac2b460cb568f2ffec64270115672ffba0ea
-DIST firefox-60.6.0esr-zh-CN.xpi 547680 BLAKE2B 2313c28a088f20c913f231176233c5e5a000cd682065c78e95ba562aea48ac3d3aa54e6e5afc3490a3ff5eb05b60a6d0b96924d3fdcaef115d9df54066e18d8e SHA512 c6bee1daa6ff6a970cfa346ba525cfe4a37389cd93900813827899d2b5a4d8195377036b6228c12403771da183f697bebfb379e33958dd930f17b3fa9b9ec11d
-DIST firefox-60.6.0esr-zh-TW.xpi 546001 BLAKE2B 5a5d38930b6156ce4fbeda72535a5b62cd76c5726985a54bd74d485b218d6d6728f2c7ef1098a5e23853bbf7c1711114def92a90169a583b89c1241dbc43c7f7 SHA512 d6ddd37719a35c2fd381062ac64bc401be360b2eb01a25520d725bbba506a6461d3931cd1faea63b9415a972b0d079b5fd04cbbb1a4395d3071ea86ad8c6b65c
-DIST firefox-60.6.0esr.source.tar.xz 267508680 BLAKE2B 8054ea336a2f3a0535f9fa067d5b4eb4e176e854037985f9dcad6448a0e4b433112b27d7addf10f1189d7c1bb693547965f4f15df82fec37a098db7916809d57 SHA512 e451910b379873f575a3dc541d0c605b085bffcd73c59c9d5d2a94678f4b2969bb140ab997873168f2f1614d9f08380599aa951bdc9b45d20f7c46ffec55bf49
 DIST firefox-60.6.1esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
 DIST firefox-60.6.1esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
 DIST firefox-60.6.1esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
diff --git a/www-client/firefox/firefox-60.5.2.ebuild b/www-client/firefox/firefox-60.5.2.ebuild
deleted file mode 100644
index b2efd3d0d491..000000000000
--- a/www-client/firefox/firefox-60.5.2.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR="1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-60.5-patches-01"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
-RESTRICT="!bindist? ( bindist )"
-
-SDIR="release"
-[[ ${PV} = *_beta* ]] && SDIR="beta"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	system-icu? ( >=dev-libs/icu-60.2 )
-	jack? ( virtual/jack )
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEPEND} virtual/opengl )
-	x86? ( ${ASM_DEPEND} virtual/opengl )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/firefox"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	# Setup api key for location services
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Default mozilla_five_home no longer valid option
-	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/firefox/firefox-60.6.0.ebuild b/www-client/firefox/firefox-60.6.0.ebuild
deleted file mode 100644
index f27995778c84..000000000000
--- a/www-client/firefox/firefox-60.6.0.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR="1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
-gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
-mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
-sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-60.6-patches-01"
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
-RESTRICT="!bindist? ( bindist )"
-
-SDIR="release"
-[[ ${PV} = *_beta* ]] && SDIR="beta"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	system-icu? ( >=dev-libs/icu-60.2 )
-	jack? ( virtual/jack )
-	>=dev-libs/nss-3.36.7
-	>=dev-libs/nspr-4.19
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
-	amd64? ( ${ASM_DEPEND} virtual/opengl )
-	x86? ( ${ASM_DEPEND} virtual/opengl )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]]; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/firefox"
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Ensure that our plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
-	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Default mozilla_five_home no longer valid option
-	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach build --verbose || die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	mozconfig_install_prefs \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if ! [ -L ${lib##*/} ]; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index a601f9a81ed2..e6116d3fea30 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,3 +1,6 @@
 DIST vivaldi-2.4.1488.35_p1-amd64.deb 59056284 BLAKE2B 45d8f058354a3138a0b28a5a4b017b8e8a5e29d46f0ccc3282bafcc9e990dffd05db6c99661c364d6f938ec25edc9f9500210a0ad15273e4e31c286bc4e0642b SHA512 6a9e5bb3aa2c85bb7207ed8e3872c98baaee3a7ad830174b64c4ee65a2fac65399b29610c4d6d784deba1e670b282fcdf851598e4fa75524d03d65a07190ce00
 DIST vivaldi-2.4.1488.35_p1-armhf.deb 52175500 BLAKE2B b6003abb80b6f2cbc8e94ee3d0ca81547cf4f94b28f718d594fd3eac0ab0621462ff5901d4092f14a4ab50f6458ca834f89fb04b8b4d1cbf0c1cd109ba48a583 SHA512 c80e0370a62c04eeb4d8e2939467371f95a7379fc46c4d8f999a7a75c4cc0bd5b3075797a57c48891c69fec336f939091caa9b3b92c5b7ae605f4426a2182de4
 DIST vivaldi-2.4.1488.35_p1-i386.deb 57279440 BLAKE2B caeb9be038a4948b5b717a36f14044301a8a094db93f1346e6b0f47dbc04a2a79aabdbee271812cfd6f278c7018af65afadafb628185ee9484b781de439042ab SHA512 b57840dd7bc267d05f360f47c2fe2c28b728db3683ac6be5270360e6be7b89fef052a955dc5ff95531891fbfccac6c9184b231d200978d7d2be8119616789f1a
+DIST vivaldi-2.4.1488.36_p1-amd64.deb 59073076 BLAKE2B 07b448bbea31fdf74f13d07258a28c52560209b8c1d47005cef5985fb50d22680706ce5cffa833042efc73d900acde1a7911d8bc760bdf7972fbfe4e2d8f4700 SHA512 07f1509739ec96de825373f61f058731613a55a1432b5ac3698b2e02eff86a587d32208e477f7df4272065c6c934c0e9e05c653440427142d345ade0cf30e397
+DIST vivaldi-2.4.1488.36_p1-armhf.deb 52193248 BLAKE2B 17a84aa2208ef7bb5ab686f0101938377626ff63ba8455507ab145a615c91eba6827299e425f9554a3e814a27068154d9ce65e73adc4a0f0d636c457d0d2c9fc SHA512 bfd4437f954503bb7e757a328c8070e783357dc0db70a5caa675cfc167883a19b0caff22ada88555a432605078360ba6be9070df9cee97e1ee88bb8f2ce55bc8
+DIST vivaldi-2.4.1488.36_p1-i386.deb 57287212 BLAKE2B 0d70ed125a29fb42e302c930615f5ef1b39443cc174da5f23896ab8f8d81e01b3d9035f00897e536f1f18199e022cff113279f0cf269bf0774b6caee96cf6a9f SHA512 6a6e3b4eec2e524eb3942d9b6c844b691704d26aa8123fe39e05e9ad4bcfabc340001325f3ed2e065de67b5e1384c67043e2d55e77e101ffa9c4544e0b4d6543
diff --git a/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild b/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
new file mode 100644
index 000000000000..98b6bc1fc327
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.4.1488.36_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+#VIVALDI_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+	sed -i \
+		-e "s|${VIVALDI_BIN}|${PN}|g" \
+		usr/share/applications/${VIVALDI_PN}.desktop \
+		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${VIVALDI_BIN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 871d5585c5bf..bdee6be25bf1 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/gunicorn/gunicorn-19.8.1.ebuild b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
index ba39f37013be..9593bdecf5c5 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
+HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index be09aedb3cd2..12333389c74a 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index 52addfae154a..0bce2c86cd25 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+HOMEPAGE="https://github.com/davatorium/rofi"
 SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2.ebuild
index ffb4b7ff5d39..5c664f0c427f 100644
--- a/x11-misc/rofi/rofi-1.5.2.ebuild
+++ b/x11-misc/rofi/rofi-1.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+HOMEPAGE="https://github.com/davatorium/rofi"
 SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 8533b2dbdb9c..20cc98b76c5d 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+HOMEPAGE="https://github.com/davatorium/rofi"
 EGIT_REPO_URI="${HOMEPAGE}"
 
 LICENSE="MIT"
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
index f5019fcee2aa..8adf157c5f3e 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1 +1,2 @@
+DIST xcalib-0.10.tar.gz 36769 BLAKE2B 419bcbe4c87bd8af5869537d334ec08e1e1d262d8a3ef550a5e99451ccfebce37025b95e7044ca782faac6f933e5a0a5b65c8ced10ea1f5aab8f3bc93290d959 SHA512 c52252c903125bf95592d35a75c818be196dd92a86ceab39e0a933162e04e160f2303d20e5892e72a23a7e8067c1e8d785381b4c327980a6fab22ed093c28f41
 DIST xcalib-0.9.0_p20161210.tar.gz 36687 BLAKE2B 7b1634a4390ba1aa90b246176e928d2bdc7f8478771744628dd454eab43ea9b42d479950c5748baadb8d081462ddc036a34f30653bc8f7871ed09e05441ad2c3 SHA512 31d9159a67082cd0c63d6ed0e34872cd776adbaf14dca754a6ae2355d24a972a6db5811a3d7e69e24c88534c7f63e8d1285304272bd293e3a93c35c240d99907
diff --git a/x11-misc/xcalib/xcalib-0.10.ebuild b/x11-misc/xcalib/xcalib-0.10.ebuild
new file mode 100644
index 000000000000..67cb6f0ee2ba
--- /dev/null
+++ b/x11-misc/xcalib/xcalib-0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Tiny monitor calibration loader for X.org"
+HOMEPAGE="https://github.com/OpenICC/xcalib"
+SRC_URI="https://github.com/OpenICC/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXext
+"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 5fbb82dec033..f4fb7b17b691 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
index 757eb7553411..803e8e61400a 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN=${PN}3
 MY_P=${MY_PN}-${PV}
-
 inherit cmake-multilib
 
 DESCRIPTION="Official GTK+:3 port of KDE's Oxygen widget style"
-HOMEPAGE="https://store.kde.org/content/show.php/?content=136216"
+HOMEPAGE="https://store.kde.org/p/1005553/"
 SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -17,7 +16,8 @@ KEYWORDS="amd64 ~ppc x86"
 SLOT="3"
 IUSE="debug"
 
-COMMON_DEPEND="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
 	dev-libs/dbus-glib[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	x11-libs/cairo[${MULTILIB_USEDEP}]
@@ -26,10 +26,7 @@ COMMON_DEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/pango[${MULTILIB_USEDEP}]
 "
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!x11-themes/oxygen-gtk:0
 "
 
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
index 9c643ec4e767..9b9e4ced8f7f 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN=${PN}2
 MY_P=${MY_PN}-${PV}
-
 inherit cmake-multilib
 
 DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
-HOMEPAGE="https://store.kde.org/content/show.php/?content=136216"
+HOMEPAGE="https://store.kde.org/p/1005553/"
 SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -17,7 +16,8 @@ KEYWORDS="amd64 ~ppc x86"
 SLOT="2"
 IUSE="debug"
 
-COMMON_DEPEND="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
 	dev-libs/dbus-glib[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	x11-libs/cairo[${MULTILIB_USEDEP}]
@@ -26,10 +26,7 @@ COMMON_DEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/pango[${MULTILIB_USEDEP}]
 "
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!x11-themes/oxygen-gtk:0
 "