Sync with portage [Tue Dec 3 09:03:21 MSK 2019].

4 years ago · 4fbd627793
parent 933e976a23
commit 4fbd627793
3704 changed files with 14473 additions and 30650 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/ddclient/metadata.xml
+++ b/acct-group/ddclient/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/fhem/metadata.xml
+++ b/acct-group/fhem/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/graylog/Manifest
+++ b/acct-group/graylog/Manifest
--- a/acct-group/graylog/graylog-0.ebuild
+++ b/acct-group/graylog/graylog-0.ebuild
@ -0,0 +1,9 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 DESCRIPTION="Graylog program group"
 ACCT_GROUP_ID=478
--- a/acct-group/graylog/metadata.xml
+++ b/acct-group/graylog/metadata.xml
@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>chainsaw@gentoo.org</email>
    <name>Tony Vroon</name>
  </maintainer>
  <maintainer type="person">
    <email>hydrapolic@gmail.com</email>
    <name>Tomáš Mózes</name>
  </maintainer>
  <maintainer type="project">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
 </pkgmetadata>
--- a/acct-group/minecraft/metadata.xml
+++ b/acct-group/minecraft/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/openrct2/Manifest
+++ b/acct-group/openrct2/Manifest
--- a/acct-group/openrct2/metadata.xml
+++ b/acct-group/openrct2/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>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/openrct2/openrct2-0.ebuild
+++ b/acct-group/openrct2/openrct2-0.ebuild
@ -0,0 +1,10 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 DESCRIPTION="A group for the OpenRCT2 dedicated server"
 ACCT_GROUP_ID="479"
--- a/acct-group/spectrum/metadata.xml
+++ b/acct-group/spectrum/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/steamcmd/metadata.xml
+++ b/acct-group/steamcmd/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/teamspeak/metadata.xml
+++ b/acct-group/teamspeak/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/unifi/metadata.xml
+++ b/acct-group/unifi/metadata.xml
@ -6,13 +6,9 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		UniFi is a management controller software for Ubiquiti UniFi APs.
 		It's purpose is to configure and monitor all those APs.
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/ddclient/metadata.xml
+++ b/acct-user/ddclient/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/fhem/metadata.xml
+++ b/acct-user/fhem/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/graylog/Manifest
+++ b/acct-user/graylog/Manifest
--- a/acct-user/graylog/graylog-0.ebuild
+++ b/acct-user/graylog/graylog-0.ebuild
@ -0,0 +1,11 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="Graylog program user"
 ACCT_USER_ID=478
 ACCT_USER_GROUPS=( graylog )
 acct-user_add_deps
--- a/acct-user/graylog/metadata.xml
+++ b/acct-user/graylog/metadata.xml
@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>chainsaw@gentoo.org</email>
    <name>Tony Vroon</name>
  </maintainer>
  <maintainer type="person">
    <email>hydrapolic@gmail.com</email>
    <name>Tomáš Mózes</name>
  </maintainer>
  <maintainer type="project">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
 </pkgmetadata>
--- a/acct-user/minecraft/metadata.xml
+++ b/acct-user/minecraft/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/openrct2/Manifest
+++ b/acct-user/openrct2/Manifest
--- a/acct-user/openrct2/metadata.xml
+++ b/acct-user/openrct2/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>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/openrct2/openrct2-0.ebuild
+++ b/acct-user/openrct2/openrct2-0.ebuild
@ -0,0 +1,13 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="A user for the OpenRCT2 dedicated server"
 ACCT_USER_GROUPS=( "openrct2" )
 ACCT_USER_ID="479"
 acct-user_add_deps
--- a/acct-user/spectrum/metadata.xml
+++ b/acct-user/spectrum/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/steamcmd/metadata.xml
+++ b/acct-user/steamcmd/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/teamspeak/metadata.xml
+++ b/acct-user/teamspeak/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/unifi/metadata.xml
+++ b/acct-user/unifi/metadata.xml
@ -6,13 +6,9 @@
 		<name>Ben Kohler</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		UniFi is a management controller software for Ubiquiti UniFi APs.
 		It's purpose is to configure and monitor all those APs.
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		It samples kernel statistics at the specified time interval
 		and uses them to derive useful realtime and cumulative performance statistics.
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@ -1,2 +1,2 @@
 DIST graylog-2.4.6.tgz 122985232 BLAKE2B 3a409a08f27c3abf1eadca57c4e8c9afc334655e050c0db9bad9d16e03acab6d92bfced708486ad8383987842d9b0a5ddc54e28d29fc426761fcb0ab8c65844c SHA512 e1941f4740f43c5b92b5faa7cde06fb15294acfed5f0f56cb21a7ceffb8616382b68b67d049a2982c68833d706e57b77f365665f12193d053a2ac0996801bcbe
 DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
 DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf
--- a/app-admin/graylog2/files/confd-r2
+++ b/app-admin/graylog2/files/confd-r2
--- a/app-admin/graylog/files/graylog.confd
+++ b/app-admin/graylog/files/graylog.confd
@ -0,0 +1,12 @@
 GRAYLOG_CONFIG_FILE="/etc/graylog/graylog.conf"
 GRAYLOG_DATA_DIR="/var/lib/graylog"
 GRAYLOG_GROUP="graylog"
 GRAYLOG_INSTALL_DIR="/usr/share/graylog"
 GRAYLOG_LOG_DIR="/var/log/graylog"
 GRAYLOG_OPTIONS=""
 GRAYLOG_USER="graylog"
 JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow"
 # Please adjust according to your bind address
 rc_need="net.lo"
--- a/app-admin/graylog/files/graylog.initd
+++ b/app-admin/graylog/files/graylog.initd
@ -0,0 +1,30 @@
 #!/sbin/openrc-run
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 command="/usr/bin/java"
 command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}"
 command_background="true"
 command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
 pidfile="/run/${RC_SVCNAME}.pid"
 output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
 error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
 directory="${GRAYLOG_INSTALL_DIR}"
 required_files="${GRAYLOG_CONFIG_FILE}"
 depend() {
 	use dns
 }
 start_pre() {
 	local d
 	for d in \
 		"${GRAYLOG_DATA_DIR}" \
 		"${GRAYLOG_DATA_DIR}/data" \
 		"${GRAYLOG_DATA_DIR}/data/journal" \
 		"${GRAYLOG_LOG_DIR}"; do
 		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
 	done
 }
--- a/app-admin/graylog2/files/initd-r2
+++ b/app-admin/graylog2/files/initd-r2
--- a/app-admin/graylog2/graylog2-2.5.1.ebuild
+++ b/app-admin/graylog2/graylog2-2.5.1.ebuild
--- a/app-admin/graylog2/graylog2-2.4.6.ebuild
+++ b/app-admin/graylog2/graylog2-2.4.6.ebuild
@ -1,36 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit user
 DESCRIPTION="Free and open source log management"
 HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
+RDEPEND="!app-admin/graylog2
 	acct-group/graylog
 	acct-user/graylog
 	>=virtual/jdk-1.8"
 DOCS=(
 	COPYING README.markdown UPGRADING.rst
 )
-GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
 QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
 S="${WORKDIR}/graylog-${PV}"
 pkg_setup() {
 	enewgroup graylog
 	enewuser graylog -1 -1 -1 graylog
 }
 src_prepare() {
 	default
@ -57,31 +51,33 @@ src_prepare() {
 	# gentoo specific paths
 	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
 		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
 		graylog.conf.example || die
 }
 src_install() {
 	default
-	insinto /etc/graylog2
+	insinto /etc/graylog
 	doins graylog.conf.example
 	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
 	doins data/contentpacks/grok-patterns.json
 	insinto "${GRAYLOG_INSTALL_DIR}"
 	doins graylog.jar
 	doins -r lib plugin
-	newconfd "${FILESDIR}/confd-r2" graylog2
+	keepdir "${GRAYLOG_DATA_DIR}"
-	newinitd "${FILESDIR}/initd-r2" graylog2
+
 	newconfd "${FILESDIR}/graylog.confd" graylog
 	newinitd "${FILESDIR}/graylog.initd" graylog
 }
 pkg_postinst() {
 	ewarn "Graylog does not depend on need.net any more (#439092)."
 	ewarn
 	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog2"
+	ewarn "/etc/conf.d/graylog"
 	ewarn
 	ewarn "Graylog requires Java >= 8"
 	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
 	ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
 }
--- a/app-admin/graylog/metadata.xml
+++ b/app-admin/graylog/metadata.xml
@ -0,0 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>chainsaw@gentoo.org</email>
    <name>Tony Vroon</name>
  </maintainer>
  <maintainer type="person">
    <email>hydrapolic@gmail.com</email>
    <name>Tomáš Mózes</name>
  </maintainer>
  <maintainer type="project">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
  <upstream>
    <remote-id type="github">graylog2/graylog2-server</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 inherit distutils-r1
@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
 RESTRICT="!test? ( test )"
 S="${WORKDIR}/${PN}"
 RDEPEND="${PYTHON_DEPS}
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 inherit distutils-r1
@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
 RESTRICT="!test? ( test )"
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@ -1,4 +1,4 @@
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
 DIST sysklogd-2.0.1.tar.gz 461158 BLAKE2B 2c56ea1b5edb11f6ce75cb34d7cb5778516fbf3cb64986a7dd6063f830e9e8040430a0deb0ac68aeb389435319ede89202b2aa31cb480fe9bd9518ad503ca6ee SHA512 24d82a2db8d7d8fbdf291964d3d42717cf3b62129d1d503986b17a8005ca414eb824c39ed787d73bac966dad5a7cc9b439efce58e218aebed72b765e07134a83
 DIST sysklogd-2.0.2.tar.gz 465933 BLAKE2B bc0181e43ca5996cfbf8a8a35d083f332e15f5c83215ec60b406cefc7817bb742d0ce094d6c0d9fe708d345db630a73ce408992d9aade18e5b69414ca4e2b2a6 SHA512 1e5e30162b1091c37801542ae44df3e5d1da09ead02dd74f81e1e35ebb2fea99bab372f00eca621340ca306a41629ccdfb3caa0d46db0fecf46e3030da932473
 DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
--- a/app-admin/sysklogd/files/sysklogd.rc9
+++ b/app-admin/sysklogd/files/sysklogd.rc9
@ -0,0 +1,82 @@
 #!/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"
 depend() {
 	need clock hostname
 	provide logger
 }
 has_klogd() {
 	[ -x "/usr/sbin/klogd" ]
 }
 start_daemon() {
 	local retval=0
 	local daemon="$1"
 	local options="$2"
 	local fg_opt=""
 	ebegin "sysklogd -> start: ${daemon}"
 	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
 		-b -m --pidfile /var/run/"${daemon}".pid \
 		-- -F ${options}
 	retval=$?
 	eend ${retval} "Failed to start ${daemon}"
 	return ${retval}
 }
 stop_daemon() {
 	local retval=0
 	local daemon="$1"
 	[ -z "${daemon}" ] && return 1
 	ebegin "sysklogd -> stop: ${daemon}"
 	# syslogd can be stubborn some times (--retry 15)...
 	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
 	retval=$?
 	eend ${retval} "Failed to stop ${daemon}"
 	return ${retval}
 }
 start() {
 	start_daemon "syslogd" "${SYSLOGD}" || return 1
 	# klogd do not always start proper if started too early
 	sleep 1
 	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
 		stop_daemon "syslogd"
 		return 1
 	fi
 	return 0
 }
 stop() {
 	if has_klogd ; then
 		stop_daemon "klogd" || return 1
 	fi
 	stop_daemon "syslogd" || return 1 
 	return 0
 }
 reload() {
 	local ret=0
 	ebegin "Reloading configuration"
 	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
 	ret=$((${ret} + $?))
 	if has_klogd ; then
 		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
 		ret=$((${ret} + $?))
 	fi
 	eend ${ret}
 }
--- a/app-admin/sysklogd/sysklogd-2.0.3.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
@ -47,7 +47,7 @@ src_install() {
 	doins syslog.conf
 	keepdir /etc/syslog.d
-	newinitd "${FILESDIR}"/sysklogd.rc8 sysklogd
+	newinitd "${FILESDIR}"/sysklogd.rc9 sysklogd
 	newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd
 	if use logrotate ; then
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamtk/metadata.xml
+++ b/app-antivirus/clamtk/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		ClamTk is a frontend for ClamAV (Clam Antivirus).
 		It is intended to be an easy to use, light-weight,
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@ -1 +1,2 @@
 DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
--- a/app-arch/tar/tar-1.32.90.ebuild
+++ b/app-arch/tar/tar-1.32.90.ebuild
@ -0,0 +1,80 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.xz
 	mirror://gnu-alpha/tar/${P}.tar.xz"
 LICENSE="GPL-3+"
 SLOT="0"
 [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )
 	static? ( ${LIB_DEPEND} )
 	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
 src_prepare() {
 	default
 	if ! use userland_GNU ; then
 		sed -i \
 			-e 's:/backup\.sh:/gbackup.sh:' \
 			scripts/{backup,dump-remind,restore}.in \
 			|| die "sed non-GNU"
 	fi
 }
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--enable-backup-scripts
 		--libexecdir="${EPREFIX}"/usr/sbin
 		$(usex userland_GNU "" "--program-prefix=g")
 		$(use_with acl posix-acls)
 		$(use_enable nls)
 		$(use_with selinux)
 		$(use_with xattr xattrs)
 	)
 	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	local p=$(usex userland_GNU "" "g")
 	if [[ -z ${p} ]] ; then
 		# a nasty yet required piece of baggage
 		exeinto /etc
 		doexe "${FILESDIR}"/rmt
 	fi
 	# autoconf looks for gtar before tar (in configure scripts), hence
 	# in Prefix it is important that it is there, otherwise, a gtar from
 	# the host system (FreeBSD, Solaris, Darwin) will be found instead
 	# of the Prefix provided (GNU) tar
 	if use prefix ; then
 		dosym tar /bin/gtar
 	fi
 	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
 	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
 	if use minimal ; then
 		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
 			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
 			-delete || die
 	fi
 }
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/cpuburn/metadata.xml
+++ b/app-benchmarks/cpuburn/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		CPU testing utilities in optimized assembler for maximum loading
 		P6 (Intel Pentium Pro/II/III and Celeron TM),
--- a/app-benchmarks/geekbench/metadata.xml
+++ b/app-benchmarks/geekbench/metadata.xml
@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-benchmarks/interbench/metadata.xml
+++ b/app-benchmarks/interbench/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		This benchmark application is designed to benchmark interactivity in Linux.
 		It is designed to measure the effect of changes in Linux kernel design or system
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		Stress-ng will stress test a computer system in various selectable ways.
 		It was designed to exercise various physical subsystems of a computer
--- a/app-benchmarks/stress/metadata.xml
+++ b/app-benchmarks/stress/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		Stress is a deliberately simple workload generator for POSIX systems.
 		It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system.
--- a/app-benchmarks/wrk/metadata.xml
+++ b/app-benchmarks/wrk/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		WRK is a modern HTTP benchmarking tool capable of generating
 		significant load when run on a single multi-core CPU.
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/ssss/metadata.xml
+++ b/app-crypt/ssss/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		SSSS is an implementation of Shamir's Secret Sharing Scheme.
 		The program suite does both: the generation of shares for a known secret,
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/firecracker/Manifest
+++ b/app-emulation/firecracker/Manifest
@ -4,26 +4,32 @@ DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e
 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
 DIST bitflags-0.5.0.crate 10940 BLAKE2B 69d9f52d1dfbec986034981f4629022b25b94c01d54424ae2399a0749c51f0f1c725ca312cfb3f953efc95732b7ca32e432e29b1e5bbba416cb4e0c21a266546 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST byteorder-1.2.1.crate 17841 BLAKE2B 2e61c88911454fb787ddc7601ae7530980e9dd6be55eb4605dc257b0753ce69be8e3cf05655e9bf118e3a3c25d709f674acb6162fcd6f08d6b73619f4d434a62 SHA512 3b8822286a3973ef80309f30e169dee5fd87d98a0b4f5a44da7e29c2f14f5ce47a9f109087c84cab09078ad0c3507bb459bac243528bf4d8eae7a958394a4041
 DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cpuid-0.1.0.crate 5473 BLAKE2B ff6536dd8fa1aeaf52b3ae28e5d0c3e0033383d7265eb91f376843516492e3f9d2c43bb6667538342158e6abb9c606b4e6129786d6cb48fe86f1c1effe005df2 SHA512 5b24b49acccaa393f351fca2a2cc7c5e5227e7e0f99680c109bff19377fa5822f37ad1561a33be25e34be654dd4f118ded974c7acc79608fe1efd8c19c4f8404
 DIST device_tree-1.1.0.crate 7049 BLAKE2B 11236d709c7d35d6482eed7ccf8ac82dfbb4412bcf2fec98fd2a806bcf8740c1d0b2745c39b5971f5292ad00887f423afc28a4c674cdf37511cd8615ff654cbd SHA512 b671b582d9f5dc19d8ff28d18fd2ed77842191084c6acbb41362491ea3c994699044fe0b0505f927ad9569d933806f8129a4eb49bf25443c0806ddcb6ffefad7
 DIST epoll-4.0.1.crate 8195 BLAKE2B 1ac732ade3c441a27832ef5f7cd75a4f80dcfbf42d195433a7bca91dcebd4f6a8ad0198daa3e3e12ef5ce50615dd85ef0d4cfe6670907ad0a65d55055b25da86 SHA512 b672091bc0b051c22a6217c37bf3986b2e173a1bf5d773590a1e181c9c0981baac656278f90aaa98f7a092e636e3bf68e5ea7a9edb6120cb90636f8db7e953d9
 DIST firecracker-0.18.0.tar.gz 4064752 BLAKE2B 6d58ca099f5f891966e7ccf25e5f22836e4066847891cbacab328fcbbb44c5c9010dc47223a626cedfd1c9443a754fbcf1b333378f6947299d7abb745944f471 SHA512 af599401a9323219b9d07d7a146c382c1a7521e6dabd10d6a4282dcbb8ea7742268b7999ab6aedcdadfb5d7f07efbd03feb20ab225f5711abcd45121f4c89f09
 DIST firecracker-0.19.0.tar.gz 4093985 BLAKE2B e974581d3c213c26b058d6536eac05e109147b3f949d83a6a8d19cd63c07e44ca7b309bf634edc5a42ebbd492485a06f21eedebb5257dbe81dd912516b37ca20 SHA512 f718cc5ec7b658c4a336f829a2db912684e1c2e2209091afddca6bb347001714c41091a32ad46822f3efe1e019f862fa1890d5f12c5b7e3bb2952492b7cf347e
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST futures-0.1.18.crate 153738 BLAKE2B df33639193cdfdf7c5ae7323e5798cc6decfdbfb3f1d819caf794e68411241f25cc05c5eae09a09a1df6f3fa8ac5de7fce5af4536108e5b530dd639c18860679 SHA512 5782b37be2bcd4c9d0ddfafba7718a48144c0f8533acbfd0217e1bf25c3c04ba95320b35765f57224cdfe0ee3a7748d1109d6e680e64bdb1a16addeac422b12e
 DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
 DIST getrandom-0.1.11.crate 23699 BLAKE2B 9239fb86a5d43a95821d5a378ef291842ac11616ebaa131130dad0bcc5edc632d9786f10c3a15654255461f9f6b221c70854c498ea82f7da24eba9074d49bdae SHA512 ddafcf536d72607edb1587e562dfe8d25091fb073377fe5dca2babfb56e6391b920c98c695ad74d5d2aabf6b28d50a4a54c305b41303250d58e01c4da46f210d
 DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
 DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
 DIST hyper-0.11.16.crate 139464 BLAKE2B 4317ba59a217d40c56f145712394a1088a8ea2fd7f5aa1bea9314e9e4fdd7122526dbd0d1158b106646003d4ee83a2268605b6409a2257cc36eed7de0ce2efe7 SHA512 ce47fdc4b0e222ac17a03fbd1609fe692c77f70725a4f29782a7366391e0d8cd07ac085413ec27aed15b73c9b510ef67841dd6613a668ff42463dddd012f0d4b
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST ipnetwork-0.14.0.crate 12580 BLAKE2B 125321fa04e08983d94f80efc5ccf449214a119557d32e3188d861802e50746a490af3645db06e730b6c4bc97e359d9c1923020c0b7316e5e0fd9e6c669b9ce0 SHA512 28f9a73dd68c967ab285f4cc832011cd66b8e91dae8cfcd7938471c55a2fbeeb78a52778481fd62c8af22d1138c8bba32fd815f7cc8663998b401f329a178d47
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST kernel-0.1.0.crate 153163 BLAKE2B 5c1635a16f69567ceaed92c028ef92bac0a07d7dba9c4a4997710fdfa881e906a4756744b978240b35ed2ddc1ddeb0e4be3b375693c12a49e2f27dd1255afc0d SHA512 75c9dd43b9f00dacbb9a3771be458721498ef77dd74db4f2e5f116c761767a007730f028d0d7a137efb35917b264134bfdedeafb90b96d50461d98b0f11a93c5
@ -38,6 +44,7 @@ DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb
 DIST logger-0.1.0.crate 7908 BLAKE2B ba678076c287e6c45106689220481ca04a620293398cecc2f73217095592dc0d30345b98df45722c91996cd75dfbd4b3bf6a1649cb7d4ae2434bdc78f3d5fdeb SHA512 a907cfc8a17197f7889a0b4b15880acb1eaf12b1fdb60d77bfe258c883c83b0644ab4d45381070921d3a2d5109a88d2ec7c1977f6952896097ea6daf6f638453
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST mime-0.3.13.crate 14939 BLAKE2B e522741251fe764f685b5f240da3e32148e54bc0f94a2e234de477d792fb0652748410ae7e625a509706bf9ec635d2528fc14e5d58e576026d8706747fc68f8b SHA512 92805a4eaebb1f6146facf1edd0b9cc710731949141af6bfc2226edb7fbd749b04bd8a921e79c2f4a31b79d11053e36a4b7b9dba9be1405a1174a8600654e320
 DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
 DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
 DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
@ -54,26 +61,33 @@ DIST pnet_sys-0.22.0.crate 3753 BLAKE2B c1e10c319d9bfc4152b8a2dc67d47afaf1609070
 DIST pnet_transport-0.22.0.crate 4549 BLAKE2B 38332a8d8e7e25a5ae43aef08980d85b5b897b07c79af144c6a04b274f0010c5117955c821c7ca10bfd2224e68fc5bc3374c81f52f66727e78ae8e06e115fa38 SHA512 7cc764f5ba037e209cf4976bc50f522f6e66f97996eb5ec60a7692ebb31adc17d725eddfcd0f819fea33dcb5c56b4572af6252d6f1cb4b0d77cd78b709e2070e
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
 DIST proc-macro2-1.0.2.crate 34779 BLAKE2B c99119a8c2158712f16524c568a03d60f0f4a72f79ea310c823c7bbf809f91f5836f4bc3388e2add1e202207fa91c24b64be438c7ee6d0eb0f27175b739382f8 SHA512 012ef53dd8f5abffa10490c95197bd0d303c681fe0da54adee75a9328a194cf827acaddc286b2237a6665a0bf9dd4c94250bce7919994412185c9de3828f733c
 DIST proc-macro2-1.0.5.crate 35430 BLAKE2B 3bb45a1659cf7352120e066f095da7f91343d17198c4af4d4b2600b78e5bc7900f7b3c1fa72b4c707e80c05f6b91155015dc72ca317932195f727c333d34ae41 SHA512 0fd9cb01781b7fca910e905c0cddd0deebb6a862d84286b694b78b7210a586ff497a211eabd27b80c3714b2019736206f88d9d97dc21f3dfffe49ca041f98783
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
 DIST regex-syntax-0.6.11.crate 283238 BLAKE2B 37a535b47f90449f6d41d1a5a3de69ff21e74fd5268961ff9f7cffd620080fbb212a1bd315db9b25b20aaaaa4ecd4b1afbb88a45a96b7e23d4b9e4742c081aec SHA512 619e1118aaaab60dcfc653cdae8fe2a8dcf49f2b06e718710f30179b4c95f1e31c04b2289f1d05d0c88b1996a3d8a327180ccf13bbd1d0259a70af7c7f449651
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST rust-libcore-0.0.3.crate 4988 BLAKE2B 0d0e663d70a73afbd13f07bfe1072f76243561570ada2ee548f2811665326d530a02ed99dcaf047212efea6e451c49273d6795b56793d409a5eb5e09bb9d4616 SHA512 67c83402776606e5266c6cbba5eeb8e506a0aa8c6f5b5b310e3b289af453bdba80d32bf517a0d626405263622460fbedadbe7934836f6a0e51502d0957002db3
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.1.crate 41990 BLAKE2B cbaa83c8d56196a5b4f76cfbc999c30e77e71435e47e0fe63fb2bb75e81f9a6e9818f8848a86a4bb9ac125d5efb7ab871690f820309e3c1d8adc515389b4036f SHA512 24210629d458b6775e252d5ce9c61bd5f45304d62a59422fafb4e10e6791559af2caeef8ef24815e897abbf48a226be55d768f4e643a2d97b534e1872e096b9d
 DIST safemem-0.3.2.crate 6858 BLAKE2B f5a1b44da1289775e380b109bd458b7bbb17cc04ed718434cf05fbb7d75387c70b51c5d8f9078aebeae7e98d1873b972a70d65a345f632f42f5c67cbe9a421c0 SHA512 6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda
 DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
 DIST seccomp-0.1.0.crate 2750 BLAKE2B cac2a5b20e640d94474f4c3db5f6102f0c45a8211080e2cc806828d1c20220d847c8bd4cf770543be56a36de4f0486725241c63215e041d2a0c35b6523eead3a SHA512 a13d27ac138e6c9fe83d25f94dcf23ec5a2a326504290bc20efc379b05d24ea5dde06a371af7e52c62fec81b0c8dd26ffb3c0a0baa3b701ccfa4f09019c6e1c8
 DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
 DIST serde-1.0.99.crate 72436 BLAKE2B 564e206ea5363898300af959efda372115de54812553853679af173fa91562562f1508d4cb570d801ea657af3aabcf8c3bdb40b762d6dc1e6a24c4a02cb09021 SHA512 9e6e55fd38777ef238d7b6c0f9f74da1e0cdc204e4735f70e6644d81e615d90c5b245bb8f2edb88751d126b3d1ca3c1e9f6922dddb645b9a1bb40bb4a8c11a0d
 DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
 DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST syntex-0.42.2.crate 3173 BLAKE2B 40624fa9370cf2c5ef02c28fb158b34926c22942ace0855d284a2c8b0ebc968492b67440eb010df10fc3fc06ed01c894b2f5ac87456ef2b7cce933cff22f1764 SHA512 b03cf0edc5367e31215e187d5ab32b76d1e909e47a34b0b9f58fe620681b7d55eed0689eb6b6c9b7312bb791d03995ce60b7daa1035df87959aa2d3117aa82c1
@ -92,12 +106,14 @@ DIST tokio-io-0.1.5.crate 33064 BLAKE2B d519c56dd896e25fe8134a0e57682c148a78215b
 DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
 DIST tokio-uds-0.1.7.crate 15094 BLAKE2B 82b9eb1726c3f5c6c52e70c40be42618bf0bb42eb61f045999af04809d98a40afb64f9e0b31097c6d6ade4d7a2239d72f28462a126a204b4a8c318c341374c50 SHA512 2d21490ceef08554e5633d602ba1c15751a9e36d3a51b58358bb99ee117de1cb029b262ec0174545ef5c88f7cf2e54823c678715e8b83ca91e6491213eeeb9eb
 DIST unicase-2.4.0.crate 20143 BLAKE2B c579faae980fc52693a229c2ca1fca62647b8dbd1566f58ed50726e3e31db238fb33da168527630c4e55a786e595ce62aaa0d0d0cdbff46d53b628d96b8d00eb SHA512 d4b7d0e217a8a9180cd01cbce4d1e2bc80a9dbeee735954968c0372c9679f4f84b73294952947890340f20f4f9158b70ec2c13adc11b1f0cb53aa893755cff22
 DIST unicase-2.5.1.crate 23105 BLAKE2B 70e6c6b61e4a1e4de56174eacd08cef19d68202d40f403a0958d56690546a4b72f2fd0957a1d591bbe49fe6f6f5acf8c1b03b7eb884873b469c61aee7466335d SHA512 fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-xid-0.0.3.crate 15998 BLAKE2B 2e112dbd311399836dd12ee37bbe7b9d83ed6fba89549784f1bf2ca9479b3e3cedd1bc2b15bf5e21b0cdb30fd3b88b973aadf37cb634024316ac33fc77d98d11 SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST utf8-ranges-1.0.4.crate 8575 BLAKE2B 686bfd854cdcb7510b07751630089f4f0cb0884017792288a63a4a8fa00e6cf1a10b38c39142e57d5b4d1f494c95f3445f343f1b34fc1883dbacfd708d8c13b6 SHA512 acd7008c92ed23cc0ad3fbacecfba2169781687c6aaa475ef5388fe416391cd209218a2cb19b9d4fc87a2a616f1dd67129d39978fe1b58be134a013f90cd53d4
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST wasi-0.5.0.crate 31104 BLAKE2B 91bf384f8f9abbdd4f75d0690056568792b7aa6a16834b73e8a5fca98d12b008f2be8101cb4e55864d2e057ba8d169010785f2acd395b69d894f8c32a62ee1ea SHA512 3996da04af8d178a6a7a2129de59ca62e51e9ff0c4dc99000919489f258598c2d6c6264736588b711df22679e8aca103fcc9e13f5a429b33bb4a28f7b909c79e
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
--- a/app-emulation/firecracker/firecracker-0.18.0.ebuild
+++ b/app-emulation/firecracker/firecracker-0.18.0.ebuild
@ -119,7 +119,7 @@ HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-m
 SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
--- a/app-emulation/firecracker/firecracker-0.19.0.ebuild
+++ b/app-emulation/firecracker/firecracker-0.19.0.ebuild
@ -0,0 +1,148 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 CRATES="
 aho-corasick-0.6.10
 backtrace-0.3.35
 backtrace-sys-0.1.31
 base64-0.9.3
 bitflags-0.5.0
 bitflags-1.2.1
 byteorder-1.2.1
 bytes-0.4.12
 c2-chacha-0.2.2
 cc-1.0.45
 cfg-if-0.1.10
 clap-2.33.0
 cpuid-0.1.0
 device_tree-1.1.0
 epoll-4.0.1
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
 futures-0.1.18
 futures-cpupool-0.1.8
 getrandom-0.1.12
 glob-0.2.11
 httparse-1.3.4
 hyper-0.11.16
 iovec-0.1.4
 ipnetwork-0.14.0
 itoa-0.4.4
 kernel-0.1.0
 kernel32-sys-0.2.2
 kvm-bindings-0.1.1
 kvm-ioctls-0.2.0
 language-tags-0.2.2
 lazy_static-1.4.0
 libc-0.2.62
 log-0.3.9
 log-0.4.8
 logger-0.1.0
 memchr-2.2.1
 mime-0.3.14
 mio-0.6.19
 mio-uds-0.6.7
 miow-0.2.1
 net2-0.2.33
 num_cpus-1.10.1
 percent-encoding-1.0.1
 pnet-0.22.0
 pnet_base-0.22.0
 pnet_datalink-0.22.0
 pnet_macros-0.22.0
 pnet_macros_support-0.22.0
 pnet_packet-0.22.0
 pnet_sys-0.22.0
 pnet_transport-0.22.0
 ppv-lite86-0.2.5
 proc-macro2-1.0.5
 quote-1.0.2
 rand-0.7.2
 rand_chacha-0.2.1
 rand_core-0.5.1
 rand_hc-0.2.0
 redox_syscall-0.1.56
 regex-1.0.6
 regex-syntax-0.6.12
 relay-0.1.1
 remove_dir_all-0.5.2
 rustc-demangle-0.1.16
 rustc-serialize-0.3.24
 ryu-1.0.1
 safemem-0.3.2
 scoped-tls-0.1.2
 seccomp-0.1.0
 serde-1.0.101
 serde_derive-1.0.101
 serde_json-1.0.41
 slab-0.4.2
 syn-1.0.5
 syntex-0.42.2
 syntex_errors-0.42.0
 syntex_pos-0.42.0
 syntex_syntax-0.42.0
 sys_util-0.1.0
 tempfile-3.1.0
 term-0.4.6
 textwrap-0.11.0
 thread_local-0.3.6
 time-0.1.42
 timerfd-1.0.0
 tokio-core-0.1.12
 tokio-io-0.1.5
 tokio-service-0.1.0
 tokio-uds-0.1.7
 unicase-2.5.1
 unicode-width-0.1.6
 unicode-xid-0.0.3
 unicode-xid-0.2.0
 utf8-ranges-1.0.4
 version_check-0.1.5
 wasi-0.7.0
 winapi-0.2.8
 winapi-0.3.8
 winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 ws2_32-sys-0.2.1"
 inherit cargo linux-info toolchain-funcs
 DESCRIPTION="Secure and fast microVMs for serverless computing"
 HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
 SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="test"
 BDEPEND="acct-group/kvm"
 set_target_arch() {
 	case "$(tc-arch)" in
 		amd64) target_arch=x86_64 ;;
 		x86)   target_arch=i686 ;;
 	esac
 }
 pkg_setup() {
 	if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
 	else
 		        CONFIG_CHECK+=" ~KVM_AMD" || \
 			CONFIG_CHECK+=" ~KVM_INTEL"
 			ERROR_KVM="${P} requires KVM in-kernel support."
 	fi
 }
 src_compile() {
 	local target_arch
 	set_target_arch
 	cargo_src_compile --target ${target_arch}-unknown-linux-gnu
 }
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@ -1 +1 @@
-DIST genymotion-3.0.2-linux_x64.bin 38744066 BLAKE2B 4c98cdc8d5a5cd98192260893b39dd838bba5903d590268d53223c1ebe712296cf25aa638c16de39ea4f83a5fd8717edbab7c043ff6a12e6455862ecd25ca7cc SHA512 5075d9a9c6c5e84ff90e05e4fa70db98cf89ad25e8765566176b94559f60cc170e383a02f50c752fb63859b757645390d977081d2f79ce0fab8607ebf3e08e01
+DIST genymotion-3.0.3-linux_x64.bin 38760629 BLAKE2B 1853f5f631c8343eafa92fcd7fd42ad7663e78cc8a3848f7aa9d2ccf61009fc4e8955930142af35c4f2f9bbb9704260882e65fa0dc5e43c5d8d45e14f43218bc SHA512 8a3d5f57cb6c5018ae78940187a8c48bc19a7627f72ab746fc361afd3400a14b4f6ce2d036c828bd238b65d5346cffdf2dd55b5177c6d909b7fd749f4088d748
--- a/app-emulation/genymotion-bin/genymotion-bin-3.0.3.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.0.3.ebuild
@ -87,7 +87,7 @@ src_install() {
 	doins "${MY_PN}"/qt.conf
 	doins "${MY_PN}"/libicu*
-	doexe "${MY_PN}"/{libcom,librendering}.so*
+	doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so*
 	# android library
 	doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@ -341,6 +341,9 @@ src_install() {
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
@ -357,9 +360,6 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@ -336,6 +336,9 @@ src_install() {
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
@ -352,9 +355,6 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@ -336,6 +336,9 @@ src_install() {
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
@ -352,9 +355,6 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@ -340,6 +340,9 @@ src_install() {
 	rm -rf "${D}"/var
 	rm -rf "${D}"/run
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
@ -356,9 +359,6 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -239,7 +239,7 @@ src_prepare() {
 	eautoreconf
 }
-src_configure() {
+my_src_configure() {
 	local myeconfargs=(
 		$(use_with apparmor)
 		$(use_with apparmor apparmor-profiles)
@ -295,6 +295,7 @@ src_configure() {
 		--disable-werror
 		--localstatedir=/var
 		--enable-dependency-tracking
 	)
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
@ -308,13 +309,11 @@ src_configure() {
 	if [[ ${PV} = *9999* ]]; then
 		# Restore gnulib's config.sub and config.guess
 		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
+		(cd ${S}/.gnulib && git reset --hard > /dev/null)
 	fi
 }
-src_test() {
+my_src_test() {
 	cd "${BUILD_DIR}"
 	# remove problematic tests, bug #591416, bug #591418
 	sed -i -e 's#commandtest$(EXEEXT) # #' \
 		-e 's#virfirewalltest$(EXEEXT) # #' \
@ -326,7 +325,7 @@ src_test() {
 	HOME="${T}" emake check || die "tests failed"
 }
-src_install() {
+my_src_install() {
 	emake DESTDIR="${D}" \
 		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
@ -337,6 +336,9 @@ src_install() {
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
@ -353,9 +355,6 @@ src_install() {
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@ -76,9 +76,7 @@
 	</flag>
 	<flag name="macvtap">
 		Support for MAC-based TAP (macvlan/macvtap). For networking instead
-		of the normal TUN/TAP. It has its advantages and disadvantages.
+		of the normal TUN/TAP.
 		macvtap support requires very new kernels and is
 		currently evolving. Support for this is experimental at best.
 	</flag>
 	<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
 		support. Relies on macvtap support.</flag>
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-admin/eselect-1.0.2"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ddate/metadata.xml
+++ b/app-misc/ddate/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		Converts gregorian dates to discordian dates.
 		Sacred document of the frogs (old erisian poem):
--- a/app-misc/fhem/metadata.xml
+++ b/app-misc/fhem/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		FHEM is a GPL'd perl server for house automation.
 		It is used to automate some common tasks in the household like
--- a/app-misc/glcdprocdriver/metadata.xml
+++ b/app-misc/glcdprocdriver/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		GLCDprocDriver is the glue between the graphlcd-base library from the GraphLCD project,
 		which is written in C++, and LCDproc's meta-driver "glcdlib", which extends supported
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>gentoo-vdr-project</name>
--- a/app-misc/kryoflux-dtc/metadata.xml
+++ b/app-misc/kryoflux-dtc/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="demos">Install example floppy game files.</flag>
 		<flag name="fast-firmware">Install fast firmware instead of slow firmware.</flag>
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		LCD4Linux is a small program that grabs information from the kernel
 		and some subsystems and displays it on an external liquid crystal display.
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		LCDproc is a piece of open source software that displays real-time system information
 		from your Linux/*BSD box on a LCD. The server supports several serial and USB devices
--- a/app-misc/mx5000tools/metadata.xml
+++ b/app-misc/mx5000tools/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		The Logitech Cordless Desktop MX 5000 Laser comes with a keyboard that has a nice LCD.
 		But Logitech did not provide any way to control the LCD on a Free operating system.
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@ -1,4 +1,4 @@
 DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
 DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
-DIST prog-express-3.8.3-1.amd64.deb 37858252 BLAKE2B 0edc06e138fb06bf1d09cc8c1e0650fd1e9f3259f8738c8ec2d072914bc1a215eff60f13871b12ea3e650824c2b2e077edc617bd35e41329505343fdc8c18a0c SHA512 e8e7088eb98e4b63e875308c45ee9dbce8cae5d86ce82eff29a2a3ad2798d22f3621fa38ccc7a66f4e6bd3b71c063e1e793453665640e11ffd0848ec243519ad
+DIST prog-express-3.8.5-1.amd64.deb 37867724 BLAKE2B a460a4e7aad36c4a2d3054332d8e380a8b8d3639316aceb7c32053b679540e31a8398b609105f8f4169f7a1bcf114c9a793e7e9a46574a6f6bbe005222a368ad SHA512 b9246633d3d213616884f6f87bbbeb30bed9cc14d46428e284de1e47e4e0c9d9be386bca6194b880bc44f53f7b831e51e27b65905f7a75a065880666d0559951
-DIST prog-express-3.8.3-1.i386.deb 37858512 BLAKE2B e812e44f7d440a7891e30fc3d9230daf034b7aa0eef800388eeccff50ef9a8dd22e5e989e7d8b6f5d07e77fe317d0fd01dd9e21e7f6510adf2e412c09ce7ac77 SHA512 b5805add8c51c6eeda2ba76ebd3a33df753527a60f81ace515e90945b70c5d720dac5d8dd87c0c381b52a690d2501b618e81cde51320759b639ec9bd143c422f
+DIST prog-express-3.8.5-1.i386.deb 37867536 BLAKE2B 067873da13374cfc52e5ef01cd02ee5594415369269898dab6fcc651f23ae0e16f1a44414bc77125e431c1411e7bfc383c45f4b037146b18a8b727c3d8d08a26 SHA512 5be2e5292986768970f6afaa16cbdd1740a610221f2de3cc21dbf751201753a1064d26d0714e482f9c95a310063aec6e2b31a8fa8a020d1d80583c0b84e0115b
--- a/app-misc/prog-express/metadata.xml
+++ b/app-misc/prog-express/metadata.xml
@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		Prog-Express is the programming device control software,
 		suitable for all USB programming devices of Batronix.
--- a/app-misc/prog-express/prog-express-3.8.5.ebuild
+++ b/app-misc/prog-express/prog-express-3.8.5.ebuild
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@ -1 +1,2 @@
 DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0
 DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
--- a/app-misc/tmuxp/tmuxp-1.5.4.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
@ -0,0 +1,38 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} pypy{,3} )
 inherit distutils-r1
 DESCRIPTION="tmux session manager. built on libtmux"
 HOMEPAGE="https://tmuxp.git-pull.com"
 SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/kaptan[${PYTHON_USEDEP}]
 	>=dev-python/libtmux-0.8[${PYTHON_USEDEP}]
 	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	<dev-python/click-8.0[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
 "
 BDEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_tests pytest
 python_test() {
 	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
 }
--- a/app-misc/yq/yq-2.9.2-r1.ebuild
+++ b/app-misc/yq/yq-2.9.2-r1.ebuild
@ -0,0 +1,40 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 inherit distutils-r1
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
 HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="app-misc/jq
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/xmltodict[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/toml[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)"
 python_prepare_all() {
 	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
 		-i test/test.py || die
 	sed -r -i 's:[[:space:]]*"coverage",:: ; s:[[:space:]]*"flake8",::' \
 		setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	"${EPYTHON}" test/test.py || die "tests failed under ${EPYTHON}"
 }
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@ -1,2 +1 @@
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
+DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
 DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a SHA512 7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
@ -1,97 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
 DESCRIPTION="Project management application"
 HOMEPAGE="https://www.calligra.org/"
 SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="activities +holidays kwallet pim X"
 # FIXME: Disabled by upstream for good reason
 # Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
 # $(add_kdeapps_dep akonadi)
 # $(add_kdeapps_dep akonadi-contacts)
 # Currently upstream-disabled:
 # =dev-libs/kproperty-3.0*:5
 # =dev-libs/kreport-3.0*:5
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-lang/perl
 	dev-libs/kdiagram:5
 	sys-libs/zlib
 	activities? ( $(add_frameworks_dep kactivities) )
 	holidays? ( $(add_frameworks_dep kholidays) )
 	kwallet? (
 		$(add_frameworks_dep kwallet)
 		app-crypt/qca:2[qt5(+)]
 	)
 	pim? (
 		<kde-apps/kcalcore-19.04.50:5
 		$(add_kdeapps_dep kcontacts)
 	)
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
 "
 RDEPEND="${DEPEND}
 	!app-office/calligra[calligra_features_plan(-)]
 	!app-office/calligra-l10n:4
 	$(add_qt_dep qtsvg)
 "
 RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${P}-qt-5.11.patch
 	"${FILESDIR}"/${P}-qca.patch
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-unused-deps.patch
 )
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package holidays KF5Holidays)
 		$(cmake-utils_use_find_package pim KF5CalendarCore)
 		$(cmake-utils_use_find_package pim KF5Contacts)
 		$(cmake-utils_use_find_package kwallet Qca-qt5)
 		$(cmake-utils_use_find_package kwallet KF5Wallet)
 	)
 	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
 	kde5_src_configure
 }
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
@ -1,99 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 KDE_APPS_MINIMAL="19.08.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
 DESCRIPTION="Project management application"
 HOMEPAGE="https://www.calligra.org/"
 SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="activities +holidays kwallet pim X"
 # FIXME: Disabled by upstream for good reason
 # Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
 # $(add_kdeapps_dep akonadi)
 # $(add_kdeapps_dep akonadi-contacts)
 # Currently upstream-disabled:
 # =dev-libs/kproperty-3.0*:5
 # =dev-libs/kreport-3.0*:5
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-lang/perl
 	dev-libs/kdiagram:5
 	sys-libs/zlib
 	activities? ( $(add_frameworks_dep kactivities) )
 	holidays? ( $(add_frameworks_dep kholidays) )
 	kwallet? (
 		$(add_frameworks_dep kwallet)
 		app-crypt/qca:2[qt5(+)]
 	)
 	pim? (
 		$(add_frameworks_dep kcalendarcore)
 		$(add_frameworks_dep kcontacts)
 	)
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
 "
 RDEPEND="${DEPEND}
 	!app-office/calligra[calligra_features_plan(-)]
 	!app-office/calligra-l10n:4
 	$(add_qt_dep qtsvg)
 "
 RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${P}-qt-5.11.patch
 	"${FILESDIR}"/${P}-qca.patch
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-unused-deps.patch
 	"${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
 )
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package holidays KF5Holidays)
 		$(cmake-utils_use_find_package pim KF5CalendarCore)
 		$(cmake-utils_use_find_package pim KF5Contacts)
 		$(cmake-utils_use_find_package kwallet Qca-qt5)
 		$(cmake-utils_use_find_package kwallet KF5Wallet)
 	)
 	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
 	kde5_src_configure
 }
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/"
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 LICENSE="GPL-2"
@ -57,7 +57,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	dev-lang/perl
 	dev-libs/kdiagram:5
 	sys-libs/zlib
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	kwallet? (
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
@ -1,46 +0,0 @@
 From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
 From: Dag Andersen <danders@get2net.dk>
 Date: Thu, 20 Jun 2019 10:52:00 +0200
 Subject: ICal: Adapt to api changes in KCalCore
 ---
 CMakeLists.txt                                     | 37 +++++++++++-----------
 src/CMakeLists.txt                                 |  4 +++
 .../filters/icalendar/export/icalendarexport.cpp   |  5 +++
 3 files changed, 27 insertions(+), 19 deletions(-)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 0dabbaf..49fa642 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
@@ -75,6 +75,10 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
     set(HAVE_QDATETIME_KCALCORE TRUE)
 endif()
 +if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.11.42)
 +    set(KCALCORE_HAVE_NO_PERSION_PTR TRUE)
 +endif()
 +
 if (PLANCHARTDEBUG)
     add_definitions(-DPLAN_CHART_DEBUG)
 endif ()
 diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
 index cd75598..ce29bfe 100644
 --- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
 +++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
@@ -141,8 +141,13 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
         todo->setOrganizer(node->projectNode()->leader());
     }
     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
 +#if KCALCORE_HAVE_NO_PERSION_PTR
 +        KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
 +        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
 +#else
         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
 +#endif
         a->setRole(KCalCore::Attendee::NonParticipant);
         todo->addAttendee(a);
     }
 -- 
 cgit v1.1
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
@ -1,84 +0,0 @@
 From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001
 From: David Faure <faure@kde.org>
 Date: Tue, 23 Jul 2019 12:26:17 +0200
 Subject: Port to KCalCore API changes
 The code is in #if 0, but I tested compilation of this in the calligra
 stable branch:
 https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0
 So you can use KCalCore again if you want :-)
 It's turning into a KF5 framework so the API will be stable from now on.
 CCMAIL: danders@get2net.dk
 ---
 .../filters/icalendar/export/icalendarexport.cpp     | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
 diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
 index b21320f..828b641 100644
 --- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
 +++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
@@ -35,6 +35,7 @@
 #include <kcalcore/attachment.h>
 #include <kcalcore/icalformat.h>
 #include <kcalcore/memorycalendar.h>
 +#include <kcalcore_version.h>
 #include <QTextCodec>
 #include <QByteArray>
@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
         todo->setOrganizer(node->projectNode()->leader());
     }
     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
 -#if KCALCORE_HAVE_NO_PERSION_PTR
 +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
         KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
 -        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
 +        KCalCore::Attendee a(p.name(), p.email());
 +        a.setRole(KCalCore::Attendee::NonParticipant);
 #else
         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
 -#endif
         a->setRole(KCalCore::Attendee::NonParticipant);
 +#endif
         todo->addAttendee(a);
     }
     DateTime st = node->startTime(id);
@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
             const QList<Resource*> lst = task->requestedResources();
             foreach(const Resource *r, lst) {
                 if (r->type() == Resource::Type_Work) {
 +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
 +                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
 +#else
                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
 +#endif
                 }
             }
         } else {
             foreach(const Resource *r, s->resources()) {
                 if (r->type() == Resource::Type_Work) {
 +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
 +                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
 +#else
                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
 +#endif
                 }
             }
@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
         todo->setPercentComplete(task->completion().percentFinished());
     }
     foreach(const Document *doc, node->documents().documents()) {
 +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
 +        todo->addAttachment(KCalCore::Attachment(doc->url().url()));
 +#else
         todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
 +#endif
     }
     if (! parent.isNull()) {
         todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
 -- 
 cgit v1.1
--- a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
@ -1,24 +0,0 @@
 From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
 From: Albert Astals Cid <aacid@kde.org>
 Date: Sun, 28 Jul 2019 00:07:33 +0200
 Subject: Fix compile on CI
 src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*>
 ---
 src/workpackage/view.h | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/src/workpackage/view.h b/src/workpackage/view.h
 index 6cae32b..cd2fc4e 100644
 --- a/src/workpackage/view.h
 +++ b/src/workpackage/view.h
@@ -24,6 +24,7 @@
 #include <KoView.h>
 +#include <QMap>
 #include <QStackedWidget>
 class QPrinter;
 -- 
 cgit v1.1
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
@ -1,127 +0,0 @@
 From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 1 Jan 2019 19:19:19 +0100
 Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
 optional
 ---
 CMakeLists.txt                | 18 +++++++++++++++++-
 src/libs/store/CMakeLists.txt | 15 +++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index eed9d3c..3cb4b63 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
             Parts
 #             Sonnet
             TextWidgets
 -            Wallet
             WidgetsAddons
             WindowSystem
             XmlGui
@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
         TYPE REQUIRED
     )
 +##
 +## Test for QCA2
 +##
 +macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
 +set_package_properties(Qca-qt5 PROPERTIES
 +    DESCRIPTION "Qt Cryptographic Architecture"
 +    URL "https:/download.kde.org/stable/qca-qt5"
 +    PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
 +    TYPE OPTIONAL
 +)
 +
 +find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
 +
 +if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
 +    add_definitions( -DQCA2 )
 +endif()
 +
     find_package(Perl REQUIRED)
     find_package(ZLIB REQUIRED)
 diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
 index 2c96fa7..f998264 100644
 --- a/src/libs/store/CMakeLists.txt
 +++ b/src/libs/store/CMakeLists.txt
@@ -4,14 +4,8 @@ endif()
 ########### libkostore ###############
 -if( Qca-qt5_FOUND )
 -    add_definitions( -DQCA2 )
 -endif()
 -
 set(kostore_LIB_SRCS
     KoDirectoryStore.cpp
 -    KoEncryptedStore.cpp
 -    KoEncryptionChecker.cpp
     KoLZF.cpp
     KoStore.cpp
     KoStoreDevice.cpp
@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
     StoreDebug.cpp
     KoNetAccess.cpp # temporary while porting
 )
 +if( Qca-qt5_FOUND )
 +    set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
 +        KoEncryptedStore.cpp
 +        KoEncryptionChecker.cpp
 +    )
 +endif()
 add_library(planstore SHARED ${kostore_LIB_SRCS})
 generate_export_header(planstore BASE_NAME kostore)
@@ -35,12 +35,11 @@ target_link_libraries(planstore
     PRIVATE
         Qt5::Gui
         KF5::Archive
 -        KF5::Wallet
         KF5::KIOWidgets
         KF5::I18n
 )
 if( Qca-qt5_FOUND )
 -    target_link_libraries(planstore PRIVATE qca-qt5)
 +    target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
 endif()
 set_target_properties(planstore PROPERTIES
 diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
 index 1615a61..55e2c32 100644
 --- a/src/libs/widgets/KoDocumentInfoDlg.cpp
 +++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
@@ -26,7 +26,9 @@
 #include "KoDocumentInfo.h"
 #include "KoDocumentBase.h"
 #include "KoGlobal.h"
 +#ifdef QCA2
 #include <KoEncryptionChecker.h>
 +#endif
 #include "KoPageWidgetItem.h"
 //#include <KoDocumentRdfBase.h>
 #include <KoIcon.h>
@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
     d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
     QWidget *infodlg = new QWidget();
     d->aboutUi->setupUi(infodlg);
 +#ifdef QCA2
     if (!KoEncryptionChecker::isEncryptionSupported()) {
 +#endif
         d->aboutUi->lblEncryptedDesc->setVisible(false);
         d->aboutUi->lblEncrypted->setVisible(false);
         d->aboutUi->pbEncrypt->setVisible(false);
         d->aboutUi->lblEncryptedPic->setVisible(false);
 +#ifdef QCA2
     }
 +#endif
     d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
     d->aboutUi->cbLanguage->setCurrentIndex(-1);
 -- 
 2.20.1
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
@ -1,124 +0,0 @@
 From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 18 Mar 2018 11:56:57 +0100
 Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
 Reviewers: #calligra:_3.0
 Tags: #calligra:_3.0
 Differential Revision: https://phabricator.kde.org/D11454
 ---
 src/kptview.h                                         | 1 +
 src/kptviewlist.cpp                                   | 1 +
 src/libs/ui/kptaccountseditor.cpp                     | 1 +
 src/libs/ui/kptdocumentspanel.h                       | 1 +
 src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
 src/libs/ui/kpttaskeditor.cpp                         | 1 +
 src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
 src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
 15 files changed, 18 insertions(+), 1 deletion(-)
 diff --git a/src/kptview.h b/src/kptview.h
 index 44d11935e71..a98e55342db 100644
 --- a/src/kptview.h
 +++ b/src/kptview.h
@@ -28,6 +28,7 @@
 #include "kptcontext.h"
 #include "kptviewbase.h"
 +#include <QActionGroup>
 #include <QDockWidget>
 #include <QMap>
 diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
 index f34e702e055..0e6db7b2ffe 100644
 --- a/src/kptviewlist.cpp
 +++ b/src/kptviewlist.cpp
@@ -25,6 +25,7 @@
 #include <QStyle>
 #include <QBrush>
 #include <QContextMenuEvent>
 +#include <QHeaderView>
 #include <QMenu>
 #include <kmessagebox.h>
 diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
 index 7991fafd779..54e3a87c94f 100644
 --- a/src/libs/ui/kptaccountseditor.cpp
 +++ b/src/libs/ui/kptaccountseditor.cpp
@@ -40,6 +40,7 @@
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QAction>
 +#include <QHeaderView>
 #include <KLocalizedString>
 #include <kactioncollection.h>
 diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
 index 00ea3af80b2..491cb1ebb86 100644
 --- a/src/libs/ui/kptdocumentspanel.h
 +++ b/src/libs/ui/kptdocumentspanel.h
@@ -26,6 +26,7 @@
 #include "kptdocuments.h"
 +#include <QModelIndexList>
 #include <QWidget>
 #include <kundo2qstack.h>
 diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
 index d1c3b1fc157..7c97a070b9a 100644
 --- a/src/libs/ui/kptitemviewsettup.cpp
 +++ b/src/libs/ui/kptitemviewsettup.cpp
@@ -25,9 +25,9 @@
 #include "KoPageLayoutWidget.h"
 +#include <QHeaderView>
 #include <QPushButton>
 -
 namespace KPlato
 {
 diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
 index 21546118d33..91db5acbb18 100644
 --- a/src/libs/ui/kpttaskeditor.cpp
 +++ b/src/libs/ui/kpttaskeditor.cpp
@@ -45,6 +45,7 @@
 #include <QVBoxLayout>
 #include <QDragMoveEvent>
 #include <QAction>
 +#include <QHeaderView>
 #include <QMenu>
 #include <kactionmenu.h>
 diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
 index 344ebc2b599..9146f06ab8c 100644
 --- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
 +++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
@@ -31,6 +31,7 @@
 #include <KFile>
 #include <QAction>
 +#include <QHeaderView>
 #include <QTreeView>
 #include <QStandardItemModel>
 #include <QModelIndex>
 diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
 index c9e17b748a9..b67e9848807 100644
 --- a/src/libs/widgets/KoPageLayoutWidget.cpp
 +++ b/src/libs/widgets/KoPageLayoutWidget.cpp
@@ -23,6 +23,8 @@
 #include <KoUnit.h>
 +#include <QButtonGroup>
 +
 class Q_DECL_HIDDEN KoPageLayoutWidget::Private
 {
 public:
 -- 
 2.16.2
--- a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
@ -1,57 +0,0 @@
 From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 1 Jan 2019 20:13:57 +0100
 Subject: Drop unused dependencies
 Test Plan: Built fine with deps removed.
 Reviewers: #calligra:_3.0, danders
 Reviewed By: #calligra:_3.0, danders
 Subscribers: danders
 Differential Revision: https://phabricator.kde.org/D17903
 ---
 CMakeLists.txt | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 3cb4b63..a6a3c79 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
             IconThemes
             ItemViews
             JobWidgets
 -            KCMUtils
             KIO
             Notifications
 #             NotifyConfig
@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
         COMPONENTS
             Core
             Gui
 -            Network
             PrintSupport
 -            Svg
             Test
             Widgets
             Xml
     )
 -    find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
 -        COMPONENTS
 -            DBus
 -            OpenGL
 -    #        Quick
 -    #        Sql
 -    #         WebKit
 -    #         WebKitWidgets
 -    )
 +    find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET)
 +
     # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
     # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
     # * Qt5 (required version >= 5.3.0)
 -- 
 cgit v1.1
--- a/app-office/calligraplan/metadata.xml
+++ b/app-office/calligraplan/metadata.xml
@ -13,6 +13,5 @@
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
 		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 	</use>
 </pkgmetadata>
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
		`DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593`
	`DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6`	`DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6`
`@ -1 +1 @@`
	`DIST genymotion-3.0.2-linux_x64.bin 38744066 BLAKE2B 4c98cdc8d5a5cd98192260893b39dd838bba5903d590268d53223c1ebe712296cf25aa638c16de39ea4f83a5fd8717edbab7c043ff6a12e6455862ecd25ca7cc SHA512 5075d9a9c6c5e84ff90e05e4fa70db98cf89ad25e8765566176b94559f60cc170e383a02f50c752fb63859b757645390d977081d2f79ce0fab8607ebf3e08e01`	`DIST genymotion-3.0.3-linux_x64.bin 38760629 BLAKE2B 1853f5f631c8343eafa92fcd7fd42ad7663e78cc8a3848f7aa9d2ccf61009fc4e8955930142af35c4f2f9bbb9704260882e65fa0dc5e43c5d8d45e14f43218bc SHA512 8a3d5f57cb6c5018ae78940187a8c48bc19a7627f72ab746fc361afd3400a14b4f6ce2d036c828bd238b65d5346cffdf2dd55b5177c6d909b7fd749f4088d748`
`@ -1 +1,2 @@`
	`DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0`	`DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0`
		`DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9`
`@ -1,2 +1 @@`
	`DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156`	`DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5`
	`DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a SHA512 7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164`