Sync with portage [Fri Sep 4 10:03:15 MSK 2020].

4 years ago · 61f88a5ffc
parent e84ab3ad35
commit 61f88a5ffc
1826 changed files with 11540 additions and 10878 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29410 BLAKE2B 57701e4c74932da3087e332785b03f853d8b9fdb58bdd1f4f0249be2716cd9a14c5fb9bea17610e155916e5b4aa4423fcb770ea73fb4a11ef7959a1556aa7578 SHA512 f35a5a55194fe7479c20564b87b7818441e4f03e0540c13cfbdf18ef375561b914a2192a80cf306354a03fe2251f439395b074e267b334a5c866edf4d10cba39
-TIMESTAMP 2020-09-03T05:08:36Z
+MANIFEST Manifest.files.gz 29441 BLAKE2B c833d2c5643e4ed6e91923d6db344c5e1a0118002c3ee2a320731226851e21e6da538a204dfc1affcd0c805161714a6783096461fe215d11720946cee4a10747 SHA512 d6e5b6ec04f4146da1a350262d11e34e1cc5b56e9d282c38e3b6954d7e3858fc233bded597f0682b1adeffe222ed3913d0318c83a366f5d877b3016817adeb84
+TIMESTAMP 2020-09-04T06:38:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9QelRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9R4O5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCreA//X9ZShY1i43GcDGkVWa9wM7EUXTKaxwlW/K8i3Ze9a+dnKAJ1PrGXYoDo
-NwRLWIs23MGs2iKeRVU+XvU/xpp2MszBy/DixyIpFIwx2DXpL6YNVpLmtkCdZeqW
-0JKv8qiULS0iwtgnWSqYsCtdWIYNBzXZJ/YyNIwDduePv6M3SnviFFen4pMbm7VO
-6zJf6lC3sA51caZVA5ZECzPQsHCwPQsWOaEw4bF1ZVX7hZ7naXOr52YF2Yoy8NfV
-j2fkQijYCPkghhiguxXXYvtGDx8krLhCRk9s5eaySyoc6Gi63VaN4xBp0cQABQMD
-CwaF+yPJddkvuUBCfpT1r6NZbdEP0puR4tk1QubQQ9H73uqgcRUooamcW75AebVy
-5aAn4tadWKiisB4yy2WIzaqSdN1aUcT9xYvXtdv4NiH7k5suhWBsAOiHZ6mdVf4w
-dk+Lus2iIptv/qL3B2V5EAX8XUNGsEe69WNQTxgGq0FmABZG5UvJXvHw4MqleQSZ
-opGsdJbnyIALxqiT0cy+wBbRR+yHwUCT1iJ305RHcjixC/Vtc7PMXzpLuu0AODo4
-sUZm0EIr+TjgeeYx2aG3loET4WKVM0sobgpLFqI5Pfx2cys4q9C1ZxLJXTPN2Fnh
-kYueT3R+Tpk/UG/7N9W+raez1coBheRr7j9h73WtB8TorHdi/Uk=
-=9uiy
+klBKUQ/+Jiy01PdLpg/ao8hBkizQg4EFI7TXD1IEeHQgnhoTdVEFphpR8RG2G6OK
+wGNZ3SylgsuNBPEj6e71LRUcfaN1R85VBGUtVTe7FpkG+BCF0vh6kd+AW54vruN/
+XRycfwG5EEJlUclekFtSxFGMQQxWv/m+/IdNeRxeJt2MznhUVer1ONMCIUDXj7Qq
+fu2OmkraxAyeOxsup2yzEtaXNN11PHzm3h4eXYGfg2PjMrpXg2udFAnVSfvQtjjP
+htTqs+d8Vj0UTUFkvQMJhkqAYuYFCiMyENIJmHZK0hacTGFi6hHMDLuZX9sy6HA3
+JFom8TBn2+8Jar1rFWn7kDTQzM7DIO57bIq2xT/5TwOGTBojwj13ayA7iNqvI8gG
+lfSwMOd/bvN+x0yB9hlA9k74xAv35lwQ5AetSp/+0FuXe23ahB6Fbu8NcahL38yJ
+dt+5tvwmIZ7ESH/9HTW3W2SnzkuUeL6+z9NBub43tPb83Ef6ktPnut5aoX1ab6K1
+37+xYoF0JsEIUjOkpCyaJZeVGFqh37ZX+RQyVmWwUE78TL6qeWTO4uCAsAvAapW5
+ijEJqxcXCtids1/F8kBbaFUitrvjZWXZEvQGvouBH6TNbUK+lOJNX2H5FQRvQ+4H
+gmrlBpVk2B0UsIEuMJ3FHXGbsbCRLuAkShcYpj3jRQwPPkZFcKE=
+=gK6u
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,6 +1,8 @@
 DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
+DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
 DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
 EBUILD ansible-2.10.0.ebuild 1883 BLAKE2B 0760346b3069ef22ef95fdedc724d4a184093dcde221df1222b29bec1012386d1a25f79e5c04aee920d0248b021a64c7ca392923afb624ef2df1d3ef61da60dc SHA512 4945d7b0263547f492b4f428aab8972f18fc7c1b540ed3b3f8f5c0c0cd3911120fd7fff9949e6eff6478eeda46de09f511b854f9617ab76b14764b4a31b0a7bf
 EBUILD ansible-2.9.12.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
+EBUILD ansible-2.9.13.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
--- a/app-admin/ansible/ansible-2.9.13.ebuild
+++ b/app-admin/ansible/ansible-2.9.13.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@ -1,14 +1,10 @@
 AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
 AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
 AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
-AUX gkrellmd 536 BLAKE2B 6d6cf06ef51a1afc7c943b78041c9d21a9630eec0a8f598c17013868085ae06d65fdac32a4abc5bfdffb1faa33010deb9e109ccd660064a5e474402c65b55008 SHA512 7a0fa7f32f2aa5739747bec37bdcf2fd5fffffd36fdcfc4c10a36dddbf3987f003d6f8ad367d4e8b9a2d50fbef618dbb9812fc65eeed3d8e70dcf2a1da587495
 AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43aa27d5eeeacf746e5df3367a3c6f68c4f4470633e52a08611dc65e41a9342b98b6d4e80da81064 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5
-AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
+AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
-DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3269 BLAKE2B 8c3ae715ca6f500851ded3929326182033152e56b2690012b83741de46b493469439374c6972abb1c495c5b8d06062ed97d8234358c8e21c08da3fd4252399b5 SHA512 9cfef7a70d9fa015e70a93e6c5bc7a65706af7c9861bb3142680ea56007b64a63f8b05e0281baee16fb03779756b4a26c8d17de784c98ca3f038813f631625b7
 EBUILD gkrellm-2.3.11-r1.ebuild 3334 BLAKE2B bbd6fe1265a6b72e1e9a9830d829e28875b8604f851f8879564aeb79bf9a807cf716ce06926b7613b043aa42644230927ef1926fe5a89c33313426d5b9791a06 SHA512 d0bdd181eed540ce917e3830cc148dc18723d32b1a825dff53ce61ef083e6d2b9a8aec61f53195588f0194f73969c665d6e56f5f4ee546d863f0eefed8bb39e8
-EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
-EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
+EBUILD gkrellm-9999.ebuild 3352 BLAKE2B dab875e96a3baacbb110e23b544c412787b5ad1f20cca62196ce6b6d5b89588275836e80fcebd1e3d141f8cd3993695687ed52aaae7af6e9c71c2310146eb13c SHA512 c939397ccb34fce1892a13abac3cc6c990c16dc9e8c3a370f7767d28b0d3c4231cb3813873a5afba938bb0a6c37bee1f0b2ff30c6e84a259cd841bd11d43649b
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	after lm_sensors
-	after hddtemp
-}
-
-start() {
-	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping GNU Krell Monitor daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
-	eend $?
-}
--- a/app-admin/gkrellm/files/gkrellmd.initd
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 description="gkrell system monitor daemon"
-pidfile="/var/run/gkrellmd.pid"
+pidfile="/run/gkrellmd.pid"
 command="/usr/bin/gkrellmd"
 command_args="${GKRELLMD_OPTS}"
 command_background="true"
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
-else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -15,6 +15,7 @@ AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9
 AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
 AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
 AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
+AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@ -25,7 +26,9 @@ DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
 DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208
+DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e957e026bacd228af9f1ed500f88f7fb543833f2398d64fe7e4546f0f29d7c65362464097bf89424174e76c954 SHA512 d59b6c3580d3379192f36e462385c74b53b0b385e63b3db7734003d0a71df8f88593a59eeccd86b1dc15800e46d050094e7a88f2636673770ddc952d0110ca29
 EBUILD salt-2019.2.5-r1.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
 EBUILD salt-3000.2-r4.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
 EBUILD salt-3000.3.ebuild 6323 BLAKE2B 8b051bae3bb397bb25bcfe341730b5c0670ca011fad15f268d9c9b33a27f9fc1c95cad659e797b1d5bca75ad9fd09d3667d7d2d7e43a1880955a70c4f40559d4 SHA512 76d5b24985a68a6c4f67c937a71c3bcbf89407ec9ceb0f40bc92cc8196d53830a3ac4000457dc2a5b9660d59a7d6fed79d646e521bcc6ddc9bb29b172eca130c
+EBUILD salt-3001.1.ebuild 6416 BLAKE2B 64799027c45712f7a56c41ac8c68342b2e74ad47e3dcd8f1a6bc469efaa2ac8130fe7814c607f20004d05b7016f19e48c64886056d91855b9f113213daaf5181 SHA512 c7c60c196882078b48a509c3dcc0b500c9826b6c07d7df5a0b015a428e1c6e91f070b17a37ec60d8f5b6fa0227a0a0a3c3ab85e8d893f5e8ee8109a6df1a1220
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
--- a/app-admin/salt/files/salt-3001.1-tests.patch
+++ b/app-admin/salt/files/salt-3001.1-tests.patch
@ -0,0 +1,151 @@
+diff --git a/tests/integration/master/test_event_return.py b/tests/integration/master/test_event_return.py
+index 1a97be0e5f..93c57f08ff 100644
+--- a/tests/integration/master/test_event_return.py
+++ b/tests/integration/master/test_event_return.py
+@@ -18,7 +18,7 @@ import time
+ import salt.ext.six as six
+ from salt.utils.nb_popen import NonBlockingPopen
+ from saltfactories.utils.ports import get_unused_localhost_port
+-from saltfactories.utils.processes.helpers import terminate_process
+from saltfactories.utils.processes import terminate_process
+ from tests.support.cli_scripts import ScriptPathMixin
+ from tests.support.mixins import AdaptedConfigurationTestCaseMixin
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py
+index 74bbc1cd90..be651591d1 100644
+--- a/tests/integration/utils/testprogram.py
+++ b/tests/integration/utils/testprogram.py
+@@ -30,7 +30,7 @@ import salt.utils.psutil_compat as psutils
+ import salt.utils.yaml
+ from salt.ext import six
+ from salt.ext.six.moves import range
+-from saltfactories.utils.processes.helpers import (
+from saltfactories.utils.processes import (
+     terminate_process,
+     terminate_process_list,
+ )
+diff --git a/tests/support/case.py b/tests/support/case.py
+index 9017027ae3..517cefb64a 100644
+--- a/tests/support/case.py
+++ b/tests/support/case.py
+@@ -25,7 +25,7 @@ import time
+ from datetime import datetime, timedelta
+ 
+ import salt.utils.files
+-from saltfactories.utils.processes.helpers import terminate_process
+from saltfactories.utils.processes import terminate_process
+ from tests.support.cli_scripts import ScriptPathMixin
+ from tests.support.helpers import RedirectStdStreams, requires_sshd_server
+ from tests.support.mixins import (  # pylint: disable=unused-import
+diff --git a/tests/support/helpers.py b/tests/support/helpers.py
+index bae2dceff4..93fbb66742 100644
+--- a/tests/support/helpers.py
+++ b/tests/support/helpers.py
+@@ -42,7 +42,7 @@ import salt.utils.versions
+ from salt.ext import six
+ from salt.ext.six.moves import builtins, range
+ from saltfactories.utils.ports import get_unused_localhost_port
+-from saltfactories.utils.processes.bases import ProcessResult
+from saltfactories.utils.processes import ProcessResult
+ from tests.support.mock import patch
+ from tests.support.runtests import RUNTIME_VARS
+ from tests.support.sminion import create_sminion
+@@ -1674,7 +1674,7 @@ class VirtualEnv(object):
+         kwargs.setdefault("stderr", subprocess.PIPE)
+         kwargs.setdefault("universal_newlines", True)
+         proc = subprocess.run(args, check=False, **kwargs)
+-        ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, proc.args)
+        ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, cmdline=proc.args)
+         log.debug(ret)
+         if check is True:
+             proc.check_returncode()
+diff --git a/tests/support/paths.py b/tests/support/paths.py
+index 1e1e081dc4..981aa54eb7 100644
+--- a/tests/support/paths.py
+++ b/tests/support/paths.py
+@@ -49,14 +49,12 @@ if TESTS_DIR not in sys.path:
+     sys.path.insert(1, TESTS_DIR)
+ 
+ SYS_TMP_DIR = os.path.abspath(
+-    os.path.realpath(
+-        # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+-        # for unix sockets: ``error: AF_UNIX path too long``
+-        # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+-        os.environ.get("TMPDIR", tempfile.gettempdir())
+-        if not sys.platform.startswith("darwin")
+-        else "/tmp"
+-    )
+    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+    # for unix sockets: ``error: AF_UNIX path too long``
+    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+    os.environ.get("TMPDIR", tempfile.gettempdir())
+    if not sys.platform.startswith("darwin")
+    else "/tmp"
+ )
+ TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir")
+ TMP_ROOT_DIR = os.path.join(TMP, "rootdir")
+diff --git a/tests/support/processes.py b/tests/support/processes.py
+index 4f264862a4..7c93e48368 100644
+--- a/tests/support/processes.py
+++ b/tests/support/processes.py
+@@ -14,7 +14,7 @@ from __future__ import absolute_import
+ 
+ import logging
+ 
+-from saltfactories.utils.processes.helpers import (  # pylint: disable=unused-import
+from saltfactories.utils.processes import (  # pylint: disable=unused-import
+     collect_child_processes,
+     terminate_process,
+     terminate_process_list,
+diff --git a/tests/unit/utils/scheduler/base.py b/tests/unit/utils/scheduler/base.py
+index 5d7f161eb5..286e047e40 100644
+--- a/tests/unit/utils/scheduler/base.py
+++ b/tests/unit/utils/scheduler/base.py
+@@ -14,7 +14,7 @@ import salt.utils.platform
+ import salt.utils.schedule
+ from salt.modules.test import ping
+ from salt.utils.process import SubprocessList
+-from saltfactories.utils.processes.helpers import terminate_process
+from saltfactories.utils.processes import terminate_process
+ from tests.support.mixins import SaltReturnAssertsMixin
+ from tests.support.mock import MagicMock, patch
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py
+index 9a3b1c428d..dfcf1c5275 100644
+--- a/tests/unit/utils/test_event.py
+++ b/tests/unit/utils/test_event.py
+@@ -21,7 +21,7 @@ import zmq
+ import zmq.eventloop.ioloop
+ from salt.ext.six.moves import range
+ from salt.ext.tornado.testing import AsyncTestCase
+-from saltfactories.utils.processes.helpers import terminate_process
+from saltfactories.utils.processes import terminate_process
+ from tests.support.events import eventpublisher_process, eventsender_process
+ from tests.support.helpers import slowTest
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
+index 5662cf621b..0339c353dc 100644
+--- a/tests/unit/utils/test_verify.py
+++ b/tests/unit/utils/test_verify.py
+@@ -343,7 +343,7 @@ class TestCleanPath(TestCase):
+     def test_clean_path_valid(self):
+         path_a = os.path.join(self.tmpdir, "foo")
+         path_b = os.path.join(self.tmpdir, "foo", "bar")
+-        assert clean_path(path_a, path_b) == path_b
+        assert clean_path(path_a, path_b) == os.path.realpath(path_b)
+ 
+     def test_clean_path_invalid(self):
+         path_a = os.path.join(self.tmpdir, "foo")
+@@ -398,10 +398,10 @@ class TestCleanPathLink(TestCase):
+         test_path = os.path.join(self.from_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
+        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
+ 
+     def test_clean_path_symlinked_tgt(self):
+         test_path = os.path.join(self.to_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
+        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
--- a/app-admin/salt/salt-3001.1.ebuild
+++ b/app-admin/salt/salt-3001.1.ebuild
@ -0,0 +1,195 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}]
+		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	#"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3001.1-tests.patch"
+	#"${FILESDIR}/salt-3000.2-tests.patch"
+
+	# https://github.com/saltstack/salt/pull/55410
+	#"${FILESDIR}/salt-3000.2-py38.patch"
+
+	# https://github.com/saltstack/salt/pull/55900
+	#"${FILESDIR}/salt-3000.2-py38-abc.patch"
+
+	# misc py38 fixups
+	#"${WORKDIR}/salt-3000.2-py38-misc.patch"
+	#"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@ -1,3 +1,3 @@
-DIST dolphin-plugins-20.08.0.tar.xz 227076 BLAKE2B 363636a0ad68b702e905cea14ca06311372b3fb647c57ea59375a859ad95d32cb2dbd851d209b991ffa143b85dcf1594cfd6493defa4886ebad6d201cf63d256 SHA512 4a9578bc9c20c9bcbb282369b7ac6955bdf1de20609762c2d0b396bd24a0a561422eda961f44761f59a2741db8b5191c8c6feb972d4a54a386ebb0fde67de5cb
-EBUILD dolphin-plugins-mountiso-20.08.0.ebuild 1556 BLAKE2B 721be636cb7b3d6e034b7051457753a0bc9d79b3abd64051ee5241599fd781baa3d1481cb34328dd8a7235089c64787beb92fd276d437f568f548102b8870a1c SHA512 81f7fadd6a9e28c4028ee319ae4419ca2652052b2a493618252be7345170af8f1677928c3b6787cd0b034588e3a037998a15ee486f90c4b0953b876d58e532f9
+DIST dolphin-plugins-20.08.1.tar.xz 228072 BLAKE2B f6d0b0945eb1d9872ef20468e7e8df308d240909eda12bda00181f088c0ede3462f5b8560416500c1f199c1587a544cb65b41b5f89b89f2d493e57d077fc5b73 SHA512 e4f0a8899fd26055a80081236e4a9e14ea5d73c011ee0bf6cc934f599d24047adf86b16ff7164edcc59e101f11ad5364d9381f6852a11d6d36571366ff135e7b
+EBUILD dolphin-plugins-mountiso-20.08.1.ebuild 1556 BLAKE2B 721be636cb7b3d6e034b7051457753a0bc9d79b3abd64051ee5241599fd781baa3d1481cb34328dd8a7235089c64787beb92fd276d437f568f548102b8870a1c SHA512 81f7fadd6a9e28c4028ee319ae4419ca2652052b2a493618252be7345170af8f1677928c3b6787cd0b034588e3a037998a15ee486f90c4b0953b876d58e532f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.1.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.1.ebuild
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,10 +1,7 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch 1239 BLAKE2B 8c5fb605998b9f321fea10d06e559a7022b598ace2c48b19a3ca662c313a513928277ba3936baac777bb64dae5ad28f6a4c7c29cac91cb5c3fd2d3e7f0c038af SHA512 cd325cf33f45f0ce6edbca5cb9b0c06fad8bf77f691030cd1a0bd2cfec046622fe0086dc8f7030309c5ccb328906dface3dd3ac2fb0f8ae7d85088854556dda3
-AUX gnupg-2.2.22-card-status.patch 566 BLAKE2B 05239a050ef0164b6f7fe48e0b45728db920c07b3928365ee046cf1e33f5b74fe763ab8044897cc56f8250b644896ca60a7c54314c1834f12a0bc1e850a085db SHA512 a8ef214b647dcb7445b2bfaab0bc419dc29aba9644e716d4961f066a850f58e35917a27079ffccec287fdb410ab587ef9c2d3060ddf3f6544e0543ee4773e509
 DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
-DIST gnupg-2.2.21.tar.bz2 6813160 BLAKE2B b4708fd34c23dec8ec5be0740a502d155b649b4c88a89e5cc6f3cb99a15f7c6e31c50247ccacfedad55600dac3e7f91a8567424d335ab5e537082261dc98aceb SHA512 b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9
-DIST gnupg-2.2.22.tar.bz2 7098444 BLAKE2B b5f306485032acadc852f4f71f2e968795843faacd5dda24ed2b20df78a3d38a364c2feade7ef8389a203e8b037fbb92129207cbc6d60b89cfb0945dded56a97 SHA512 3e5a8bb91c122f97acee2a93e3233db89bff9b96c6ec052c95bd2fe7e46c79a8afaac536c05675a7129e332272d62c677722a12cb05386b54a8d12ef82b6c5fa
+DIST gnupg-2.2.23.tar.bz2 7099806 BLAKE2B 0b9c1f5c8931399cfd9d95f107f91869733c4a986476ea43631b4265b1a5c26cfb8c9bb24ef6a295af7aa803749caaedde26365f6f50a7c946c1f86c867d855d SHA512 736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90
 EBUILD gnupg-2.2.20-r1.ebuild 5165 BLAKE2B e3dc2ae617271a720cee1cb3e2495cf760ab3abc21eec49b5e56b5bc6a84b0e952ae5e8a724750fbbe468024d2578dbdc130941ffe17d6e52d5e270d93e609f8 SHA512 64148a3ada65fcd846d2134506211c6436d86e257ae9464a627a4be4f78cc12a39e4c82a63921af3e6dcc9dea8508637e1dad31532f21dca50d0f9ef75bd4e12
-EBUILD gnupg-2.2.21.ebuild 5174 BLAKE2B 0fda5af16939b6bd7ce13f8c86bfa6155168cb1ba961b79cb835bf0b33e97b07d4e8aaaae36cbf5ff66890ca7665cf5eec70e169fd7020de28b7103df30b30f3 SHA512 d23cd61d5fe68ca62826b01662d2cfe94d14a05730ede2ee8eb90584d9caa77fae82310a23a1c1c5e80cd2105e9928db8af00d30a36281938d1df862d61efa59
-EBUILD gnupg-2.2.22-r1.ebuild 5139 BLAKE2B ea9797d31a2f40c85c578b7538fc2f0344855b96c150a2885ab4b156b2b7705711ac2ebdfadb28b03cb5589ee2dfdd2370e78b6f73951abaedf9284e6809c0de SHA512 7ec770974abc8afa1dbf4b4aa48e271848cebf71038afd15aa234081022f370be9c7febcb38092087aac27eb8159af5b8629b74572ce3f40dde6a78ccd042642
-MISC metadata.xml 1188 BLAKE2B f601b89c5d502842408ef72864bf326234a0aa155bb43adab98a87ad8dacb7174c5286bb78d3de9cc25756268887fb251e9690d600d52221aa55fe97ba8f0564 SHA512 11fda1a943f17049e5a13c4219caa96a6fa5867d5ba973bc2b14da652429ec3e82c32a1a10baa0fa93ff8b851216ead927b19863627203115ba04fc5034ec39d
+EBUILD gnupg-2.2.23.ebuild 5024 BLAKE2B f2248af9026e7c7b0c81ddecf91e5ca26cdebbd53750ce27188f70d113092ed7088a2e6b3c905e8cbffffb52255f67e20e6610b3b20f14a608d962abb7ec1b99 SHA512 bda72d6e42cd6d89d9af82ee5c3210bbde7a99dd1f10ba6e4cc3044f7e2c240e94f46288018e30e385ec56a9d058a04ba8378fd5083c1ce5065076ebfd3949df
+MISC metadata.xml 1300 BLAKE2B 38d3b1b62067c960147f95b31f8b837ef53daf6af7f160e0c99ef510816194040d89ffb1a6001e76ea22423a8bd0f069983eeb76cf98521e3e1b14c3ded01bc4 SHA512 53118986bb5dcf64f9b4e1f5ac95df950148919a20b45d7252a41adbcfe6da6c1a166d68f3695545cd1c886e71a5da015ae1cd20df8d89b4af4210dc45d5068a
--- a/app-crypt/gnupg/files/gnupg-2.2.22-card-status.patch
+++ b/app-crypt/gnupg/files/gnupg-2.2.22-card-status.patch
@ -1,20 +0,0 @@
-diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
-index 8a1d30d5b..ccc360fc8 100644
--- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -2357,10 +2357,15 @@ verify_chv2 (app_t app,
-   int rc;
-   char *pinvalue;
-   int pinlen;
-+  int i;
- 
-   if (app->did_chv2)
-     return 0;  /* We already verified CHV2.  */
- 
-+  /* Make sure we have load the public keys.  */
-+  for (i = 0; i < 3; i++)
-+    get_public_key (app, i);
-+
-   if (app->app_local->pk[1].key || app->app_local->pk[2].key)
-     {
-       rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen);
--- a/app-crypt/gnupg/gnupg-2.2.21.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.21.ebuild
@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
-
-pkg_postinst() {
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
-}
--- a/app-crypt/gnupg/gnupg-2.2.22-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.22-r1.ebuild
@ -50,7 +50,6 @@ DOCS=(

 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${P}-card-status.patch"
 )

 src_prepare() {
@ -67,7 +66,30 @@ src_prepare() {
 }

 src_configure() {
-	local myconf=()
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-all-tests
+		--enable-gpg
+		--enable-gpgsm
+		--enable-large-secmem
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)

 	if use prefix && use usb; then
 		# bug #649598
@ -98,30 +120,7 @@ src_configure() {
 	# the build where the install guide previously make the user chose the
 	# logger & mta early in the install.

-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	econf "${myconf[@]}"
 }

 src_compile() {
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@ -9,6 +9,10 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<use>
 		<flag name="smartcard">
 		Build scdaemon software. Enables usage of OpenPGP cards. For
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@ -1,3 +1,3 @@
 DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
-EBUILD gpa-0.10.0.ebuild 818 BLAKE2B 987f2737c3d974f2e2ae5270cb6442d87e4cb0c24d190601dc1105730584f5dbfb22d79d32464c7d02ed5e6e32fa9160478d9f8d808b2bfb92c7a67fe2cddc14 SHA512 177b81e88c02943187cb5c915dce013e01f9b0b3274e4049c834e473a6c327b0312d3045fb5ae2cda3c85da443ea0acdd63fa57d7912001e51be182367001c34
+EBUILD gpa-0.10.0.ebuild 831 BLAKE2B eda7ac1940e4e5319baef416a93d088b20f84adea5e11432a5cdb3839159a056e37f3ce66c84e5c59e1055f606b6912702073cace915c3019ed6104aecfca1c8 SHA512 a2d244cf49742c1f8019fe89cdb3b4fc3fcdbf93db95275a1e436d890b6335a01ccc4e9c656334826f1cf042a8f6309b502b24827f6a6f3dda060e4d24cda43b
 MISC metadata.xml 251 BLAKE2B d75781c46bd2764ba6a64a2ba01f0098ac80664dff29e71d7804bf2687cb04d0255c6f0f33f29cec0aeb5507307be34d78de33f308a032990759bca2ce26108b SHA512 bd4fa9d3efc3d892de2b5912049b96e4c55bb081c85d032e1cb84f68e7e22acbca76b82b20c9dae524e9c7a7802dd0b7dfed9a8f7521e04bd8c0c115213f4346
--- a/app-crypt/gpa/gpa-0.10.0.ebuild
+++ b/app-crypt/gpa/gpa-0.10.0.ebuild
@ -3,6 +3,8 @@

 EAPI=7

+inherit xdg
+
 DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
 HOMEPAGE="http://gpa.wald.intevation.org"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@ -1,7 +1,7 @@
 DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
 DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
 DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
-EBUILD zulucrypt-5.1.0.ebuild 1025 BLAKE2B 8852e894526d6b4db119e06f5d903226bb7c30aba504dbebde4bd93caa16162fc1f0562f314922de4f4feb3ea447c83659b5daabe35104f5182211c7a35b1106 SHA512 4f5411bfdfdf7c2f1b73602df3a9b1334f1f833cf3b4685d51381ca017870b02f270307447f8ea996b280d017f43b5d759f0ea087f600b54927ed314cddba96f
-EBUILD zulucrypt-5.4.0.ebuild 1082 BLAKE2B 8c5f7ebad6b607bb58580b74e450e7449c09a53a1ba43dfa3f39e3cd7ddac08f3a553d1da16ab1074a4aa3585ddd9ce0611a8ee3f5e26516fe7f368e5f72ee51 SHA512 98da7b2cbd5c8b270bd7dbb6f8dc018489682fec0409f9cb00df476ca03514952bfd622a084fc14295d06f5536bcaa861e495fec71bd1485ffa4dfbed20b4e72
-EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1143 BLAKE2B c4e505eba9cdb13453dabbb4cff8afba36f0d86d60a3cd906ef658db26d5feb97af00bdf5a935f7e2655ae818f424f607e7cffebf320193a3c8ff823b4d175f9 SHA512 72e9617b6b5f98374d404cad23df38347e804ac9f13130e72c061dadef54ab809715e67bb0fbc8f8723d4c1875567f108fa5d5c093352d3aa1b889743d2cc086
+EBUILD zulucrypt-5.1.0.ebuild 1026 BLAKE2B bfe0ea6f75dfc510f6eff072ebe0b1044b8939100579a4eafcb018e2d1e6dcf807880429da953bd7a4accea790b24ef9ba1d25b5ffe8671921ec815f5e9abee2 SHA512 d2eecbd4d4369acd7037fd3f318ff8c7a30965d0a8166c9fa1e8a4195410d0197a1cdb57f59cf606cea720939e9bf5f6dd923e114f9a971d56458dd4d64cead3
+EBUILD zulucrypt-5.4.0.ebuild 1083 BLAKE2B 0bffbf733aa810c08c599a8fdcf004ffe12ecac1f12ab92cbf499acc6fd852465224aecdeba8935ec906068c038d209b96a2a4a5caabc03b92ccc180e9d011e8 SHA512 8afff3e935c2ffefd2133dcaa8f9c9ec17a68f11b8ffaa83f99d97dc8e6542c14933e16b034a906d42ffacc820669c8da5b3298534f91e095c93403341e8afe6
+EBUILD zulucrypt-5.4.0_pre20180223.ebuild 1144 BLAKE2B 6653aa2a2519aeb567f95a1f77b70ec1fb134a3277dcb2a668bb0be5a995e914a7260c73c2f31b2fbef1b60ee9c69617ddb29a6c2d0bb2c1a640d052f94b6528 SHA512 aeac169cc31a0da4ef03add49543f64a943f9b5dddea719e531a4387ac04c3ea2650d573798acdb3d808442415e2864838eb2f1f98f53bc477e1a3af707faded
 MISC metadata.xml 697 BLAKE2B 905f662853dcdf92e5ab202e0bc832665f75827638a3217bc9a45ea3078ccc3ba5f9b6a95b2caf36d1d6d87f9617e69e706dafd06ac8758bb93c46bcf2eb9399 SHA512 9e1ed2f8bde794ea6b21e3129f6952a715e110cd06227a385dd3655fa7c0e7fe300f4aefbde827f842c9972ed39d1e908dd80d5bef5cd5c18bb27779006e09fe
--- a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit cmake-utils
+inherit cmake-utils xdg

 DESCRIPTION="Front end to cryptsetup"
 HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit cmake-utils
+inherit cmake-utils xdg

 DESCRIPTION="Front end to cryptsetup"
 HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit cmake-utils
+inherit cmake-utils xdg

 DESCRIPTION="Front end to cryptsetup"
 HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/dikt/Manifest
+++ b/app-dicts/dikt/Manifest
@ -1,3 +1,3 @@
 DIST dikt-2s1.tar.xz 52620 BLAKE2B 7afbefdf136b4aaf81ca30399263760a10366c362f07cf620a2c42ab10e5cd6b1eb3ada308f99d7a80a077089cc189ca634d5fdb30a30063dc12fc5e748ad555 SHA512 b7b26ace5ce6326191047d0d0515db2b88e790475be569d7bb994879046aa26c93a663d6bef31f8e8b233377ebd602355fb11b275f3aec910f99a5372fcde682
-EBUILD dikt-2s_p1.ebuild 1039 BLAKE2B 6e096474a80ad1d1c71b14e9f1de6eaee57decf856be98606e6b99574dae2e31796fc8b8161efc38713f813963cb40d796c2a28af884813ad401cc6a394cf9de SHA512 2995c925bc211174329a8e23789f86f297685e8c3993346f231ea797b984b6d842d6eb61b8afa57389623de90da320777e3d79af8c0881ea2260547c1681ee4a
+EBUILD dikt-2s_p1.ebuild 1103 BLAKE2B cd4d5db8e02eb20b1ae6848517409fd49bfd1c30b9c84533bb92f050a7ffe3edd4d335bf23f9b23b55918f8370dd1edae2cd4b686f4d9b243a2e4d3f0612b989 SHA512 32967645549e4dc180a8a0a5c1b75b2e191fa1d4fbe2c62cd0b8d65f1b9abab1b69a606f03ba34e31f2bf27d804320ae645912d4df388dfdd5f0ea1c00bffa87
 MISC metadata.xml 326 BLAKE2B 624268b9a2d4f8983ec8169bd8104664b0c801608dfdc5b14bab148ed403d7953fef7d1dcdc9bb38fe96537caa8039d727be4c1f8e2583177940cf86b24c6340 SHA512 5916d213c1415f8acd3c51547b307708e108381384001ac3cb940ae74d7c20313f0917128b9b20f6d30693f08f29ffb721e55586d6ce9b8b5d99fc72c9e35dc0
--- a/app-dicts/dikt/dikt-2s_p1.ebuild
+++ b/app-dicts/dikt/dikt-2s_p1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,7 +10,7 @@ inherit ecm

 DESCRIPTION="Dictionary application that implements the Dict protocol"
 HOMEPAGE="https://www.dikt.tv/"
-SRC_URI="https://bitbucket.org/dikt/code/downloads/${MY_P}.txz -> ${MY_P}.tar.xz"
+SRC_URI="https://bitbucket-archive.softwareheritage.org/static/67/67f37093-df38-43b8-845b-2952e0a33bb3/attachments/${MY_P}.txz -> ${MY_P}.tar.xz"

 LICENSE="BSD-2"
 SLOT="5"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@ -16,7 +16,7 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88
-EBUILD xemacs-21.4.24-r2.ebuild 7134 BLAKE2B 82534b136ce19a490fe9c7f4b199390dc9a35a187192651e480c4973978e0978f3b1eb0b1122473ca8e58768ef8f404632a71e1122f3c8522170704e448b8ccb SHA512 129287eb80b4266419c913322a153b3b3a187a71776b315f9533fc4355b8cb32c21980288660fb796aff2e3d0330e3853164e7da5ee3da5383ce452de55364e2
+EBUILD xemacs-21.4.24-r2.ebuild 7133 BLAKE2B 461b6af9b047f027c51a3bcdbb8b49cd295c4b4b2151dfb6af9c835f34d9e1efefdd0131980bbb6a389dbf4fe9a3f6b8a86184fc9d4f31efc8ae0ea9616dcd2d SHA512 6de4845ce82eaae1c6379f8500bd5436df241772378ad19320b5cd7c7d2cebe029d3afd17c8cd82976e28e7230fdcea28ae1e8d5ab86532297509d2e550a6b7b
 EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186
 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
 EBUILD xemacs-21.5.34-r5.ebuild 7390 BLAKE2B 89344346e872dc22a2888e39dc5bab80b5a216600914ce13d3567508b4a8f6ae6ae7f8ea520e5731777d0817f96a12acd0aca22f20d3295102e3a6f2625824c9 SHA512 a0600d8b93ada5f905341295b9f23f212312ec8c3998cc2e4cb676184f7140b8d10cce4b9e2e08e323fd94996283f84cc2e5cc50a625659126e044231d25df4d
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"

 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@ -1,4 +1,4 @@
 AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 946 BLAKE2B f14b5b0458bd945036024ba1e60e6cdd93657e89c2f8c6f9c9dfc1121b83ac84acec69a9313223942571258cc9b8376641dcd40cd67f1709ea6ddca2aa280130 SHA512 7ce718160893430a6bc75e5a052798013964f28b15409f08e4d499068b58199c208292e6b6c9fe042dcadb9a17ca1cad62edcaa488ae0e3438243ced97be60a8
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 950 BLAKE2B 49fe9c2eb89319395c7e0b7d9e86289da166310b790818f9090c44c7a7bf2dcab713d25c67141a19727360acf71e9a9253ee53e17189d7b0328e3352fe55d81c SHA512 664f046e92bcec6884509a775ec3fe9e83e7adcc955efc1a1cfa3c97a8565c9a4813c22f03d7c8aaff69c6a020eddd24cc694ba914cfe0677ccfc3f73b0632d6
 MISC metadata.xml 325 BLAKE2B 7c4175f6741e1995a7285b616d1742039e06cfa7d7f59c67bf06ceed25410aa6bb7b07147e5d3aad0bd73b9a8c734a35d0978198e77d7ef16776a1d90a7e4df9 SHA512 fd55362003abd57da1426553ca63ab1ad8559045fd4214911861b40ed44439b7253a4b481112df6b5c3741f955e5a4e01a4717cc11babe5c23563ba25672bde2
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
 WX_GTK_VER="3.0"

-inherit autotools wxwidgets
+inherit autotools wxwidgets xdg

 DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
 HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -3,16 +3,19 @@ AUX docker-compose-1.26.0-setup-py.patch 2410 BLAKE2B c04145747e7a770646687008b6
 AUX docker-compose-1.26.1-setup-py.patch 2460 BLAKE2B 502198ab7807ab6dc37e1dc671c72b980d5e1cffc7c6c3efe2281687ba47f0286027b19b781d340e7ba0f9b50bc27393542713301e17d6f4f10ed82b067a45b2 SHA512 2588fb55595e62a1d601f4e723ba2178fb4a9ad8d7ff6f0b1d1b62b0e3d273635665c3b6c257adf6c3ff64bdff7f4706e1bfe81e538723900740e17a3eb19fae
 AUX docker-compose-1.26.2-setup-py.patch 2411 BLAKE2B 76e6c2037148a08c46ac1758d58cdaf10785d4b06cd70afc850d30792b49ca7c1d38a305b2d5023eafe64f7271c6f4639aaf008a951b949ade555fc0b48974d1 SHA512 225dbbca638fead6fd0b87da6a185388e3045bee0643337c93686e19b2d3a92996033c5af4c989d60e98b79b68c45ef6aa683b5183ebf9de7468cd210d831c89
 AUX docker-compose-1.27.0_rc1-setup-py.patch 1841 BLAKE2B 148e3ba6b8d283113e719d82f96590d522c8476cb3d9ae1031009e2ddf6575831a30236898fce516a858d5e534f8034c2247cecfb5d691e74a1320ad4bad7cb0 SHA512 5d481418570702348adbb1e3de6eca073b42d7d3ba9c850e2cb2f4607de4243bb57dcb702aabd24938e62a2e04612099e65946db44a0b0675b990df23ad9e263
+AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
 DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
 DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a SHA512 e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
 DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
 DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c SHA512 ae952deeee7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062
 DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b SHA512 556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19
+DIST docker-compose-1.27.0_rc3.tar.gz 308370 BLAKE2B 094a28a4de8f32dfd82e0720a68cdae1493f63dc553e663081df3b9edf89593c76fba6b67eddcd1d1cd22966345e7d9a535e8603ed3a8f619fda41a1a8b1db9f SHA512 ad996f0df612741ce36e3549d846d3fc507f687e41ed4fb5bd694faa48906da7ca4054d56ab90fe2e64d4548955ec366867be29a449044c357e45b147e475fd9
 EBUILD docker-compose-1.25.5.ebuild 1935 BLAKE2B 1290c12b6cad7e41f6450c68a5284f17acfa505fa3d0dbc1a7489a0d07d960fd1624c273f3fe57ded1c8098b1f69020d8eb3f1c2babff8f63f2b9ba008600579 SHA512 9ceb962c7acb6beaf2a2c5005380be0b2685c6a802cd00795f734034b5a8a43e9272ed665c7d11184ad5247f4d9d76a20f49fe724e901f4d735524c0f1938930
 EBUILD docker-compose-1.26.0.ebuild 2075 BLAKE2B d0e7b3869529fc9ee471ecae8a3e3b74a49d119992771dd773b587047677a6e98f206e8f450798a5bba1fd84bd297c499cd9f98cbaf105e8291a1a1899378689 SHA512 ec30e3d9c6f43001dee3b75227b7d4d5d99877fe420d486a3c060f49329b0d10f51be1f49722984f84b81f0b66967b436ea1654e7a9bd7f8120ec7fac47dd633
 EBUILD docker-compose-1.26.1.ebuild 2075 BLAKE2B 6fbfe7a1d33817e5de2f20b25d6268a6121733c744120591b971e9c392a9fe183ded1c1603e01da0e9c9eccec0fd8a3543bba6b3b7d9581b7042db4d36b84db8 SHA512 cc9827e7089b7a6fa26905d3b2f52f7b491ab0360093300418752c24820c3b733bcdb6c4e99392b87daefbf61f14d5117d55dbba6ccde641955db4627270887c
 EBUILD docker-compose-1.26.2.ebuild 2075 BLAKE2B c8e6bcdd6a79366828d9c4a0993398b56c95681ad61e5114d31065a222005ec53bb2d8afa00ccca215d9e1e46c3ac3e728719f2867dfd5c907913c68aa577a1d SHA512 56c3ef2e46b5b48d691989a424e91cb16d6ba2397254da61e358faa6173c1572bb72c83b2fae78c14c9a5e81672819f09b07551b32d39f59ef4cf06ea0c0a8be
 EBUILD docker-compose-1.27.0_rc1.ebuild 2101 BLAKE2B 2decaaa0488e24e773dc3aedde2bfcc6fc528382517247e01fd24d8569df64e81495a0f228c2618df00077e20f02f2c82fcedacd4041779dbd9c21030d06cb7d SHA512 4e4e4c9b04ab2449bb00d185d9d4c3c3634ddcbda659f84833364a5bc72381571f7239e36fe684e60528f784b53c308b23efc920e85f7f7cfda0ee479669de48
 EBUILD docker-compose-1.27.0_rc2.ebuild 2101 BLAKE2B 23448e65a7048256ba744408fa044e96c6930e4c4fee859c647aae74fc7011aa78beb22632f28f5605380fc01be1100bb3fe6c81d56d1d78cd4eeeed2330db16 SHA512 8df3aa342a7e57c9b9baaabaec28bb8d5d459d1da835f482e5c952d475e18c140f78655a18d80fb541a2ccd4bdcd64a09a55892af8c6bda003500ec0c785838d
+EBUILD docker-compose-1.27.0_rc3.ebuild 2101 BLAKE2B 2c3f32bc4f3db17da1556944ea72dec59bb6bc65b392781709c98ccc97869a3570fa83914fb176529e7d78d5c033f1ad65bc631911824640a0ea77f5edd37edc SHA512 eb27182a779b033fe7cbba94ef99aa2bdf7cb7eb9c8e608846f904fe0584c16af3857b6f46dc246f1876ee1633ad0d9015e5d908b44d51bc73a4a28b94a811db
 MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
--- a/app-emulation/docker-compose/docker-compose-1.27.0_rc3.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.27.0_rc3.ebuild
@ -0,0 +1,73 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-emulation/docker-compose/files/docker-compose-1.27.0_rc3-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.27.0_rc3-setup-py.patch
@ -0,0 +1,67 @@
+From 3b4800ed5b24cea7af00aa868964e3d46e81364e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 3 Sep 2020 19:59:36 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e0d4340..648a736 100644
+--- a/setup.py
+++ b/setup.py
+@@ -25,33 +25,33 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-    'cached-property >= 1.2.0, < 2',
+-    'docopt >= 0.6.1, < 1',
+-    'PyYAML >= 3.10, < 6',
+-    'requests >= 2.20.0, < 3',
+-    'texttable >= 0.9.0, < 2',
+-    'websocket-client >= 0.32.0, < 1',
+-    'distro >= 1.5.0, < 2',
+-    'docker[ssh] >= 4.3.1, < 5',
+-    'dockerpty >= 0.4.1, < 1',
+-    'jsonschema >= 2.5.1, < 4',
+-    'python-dotenv >= 0.13.0, < 1',
+    'cached-property >= 1.2.0',
+    'docopt >= 0.6.1',
+    'PyYAML >= 3.10',
+    'requests >= 2.20.0',
+    'texttable >= 0.9.0',
+    'websocket-client >= 0.32.0',
+    'distro >= 1.5.0',
+    'docker[ssh] >= 4.3.1',
+    'dockerpty >= 0.4.1',
+    'jsonschema >= 2.5.1',
+    'python-dotenv >= 0.13.0',
+ ]
+ 
+ 
+ tests_require = [
+-    'ddt >= 1.2.2, < 2',
+-    'pytest < 6',
+    'ddt >= 1.2.2',
+    'pytest',
+ ]
+ 
+ 
+ if sys.version_info[:2] < (3, 4):
+-    tests_require.append('mock >= 1.0.1, < 4')
+    tests_require.append('mock >= 1.0.1')
+ 
+ extras_require = {
+-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+    ':sys_platform == "win32"': ['colorama >= 0.4'],
+    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+     'tests': tests_require,
+ }
+ 
+-- 
+2.27.0
+
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@ -5,5 +5,5 @@ AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1
 DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da SHA512 a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
 DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a SHA512 5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2
 EBUILD lxc-4.0.3.ebuild 4518 BLAKE2B 8d3ddd84485e5ae0fd95d844913c62c3baacf085cedbe404a4e21f412832aa1a54c630c6b6185365d170dbe7668f9ca8ff56faf63b55a641f144a2008dcdcb63 SHA512 ffec2224901bf8a31162d80484ecf8f4f335f8338f5695f076d9d79c642bad4d70099e2455040a892691d6cbbeb418853fc4ae1e69eb7ce3b2667f21c05eb1ab
-EBUILD lxc-4.0.4.ebuild 4458 BLAKE2B c5e5a4226510f3298ac4ee187a4e06d54ad1a33cfb68619c2a99a47b54efe6518c9adf69072a99c8326eb049708e6a59735340e79647c5c823680823a102ffd5 SHA512 a8104865a6531307a78e3d6fb4a9981025d9e90607521e9ac951f843313d08533285983d163546e2c1912f03f869419d25762434b9f0382908d0b9d39d8c5a1c
+EBUILD lxc-4.0.4.ebuild 4456 BLAKE2B c26e22262670697ab2a6ce7603e30d0099a24ebdf7de6b837083b9de1ba5f36e6a21017b3f6b70ed07f86e26665203621b53914cd8bda46498600706de0b4271 SHA512 d17b79efa51025432f3eb30d7bd475a859908956bacbad7e3a671a84b8b747d0527e50fea399d79bca17855c4b6fb0336d2e91fd2c161893616645e1635ac91d
 MISC metadata.xml 614 BLAKE2B 8c637599d38ecb5fd975fbb4385998886e450cd01d71c342a212258acf6fa0de3a377189544ab744da55b1d85ad5dd8fd2bbbb2daef7389ce61dd7d17bab7f00 SHA512 a14166b818647f0c5c6bb8402f82b333ce52591645c7ec86c8fff953889d61d00db0bcf46faca630a2f472c2918484a230b7b3fcc06099fbdbe4e31ec6bb9270
--- a/app-emulation/lxc/lxc-4.0.4.ebuild
+++ b/app-emulation/lxc/lxc-4.0.4.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 	https://github.com/lxc/lxc/archive/${P}.tar.gz"

-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"

 LICENSE="LGPL-3"
 SLOT="0"
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-chuck/Manifest
+++ b/app-eselect/eselect-chuck/Manifest
@ -1,3 +1,3 @@
 DIST chuck.eselect-1.0.2.bz2 1261 BLAKE2B 9d8171538a8846a8b7ab1d932bd03234e4d2e2e99a5bf951e0cca95b5c5a20612e87f0b1eaa8997f9f7ef14aa5f4749264cd8ba52fc858681f29b060f6cadaf8 SHA512 a89f0ed00a44e81ff16b8668cfa23a0c794efc35bbcf5e2f06eb5fe9a56095948fa8ddf36a8a3371fc7ab255f539b563831b527717b58149d19dc0d3c32ca387
-EBUILD eselect-chuck-1.0.2.ebuild 522 BLAKE2B aa3d39b66ae23a9e85f8fbb4a287c3fab972d8d43cdbfa585924eb74150f87c439ea13f8c29ef9605a72ceb9cc9b8aee7ffbfe18928f4ee9991f54dae2e603d6 SHA512 5bd827b45ad6891b46f40435e2d3c9efbf9b302382e5d22da089ab1fafc3d08d8a860e29acc4c385a687939a0480cb7cd21289d6cc8ba4c75b8c2872e6111e5f
+EBUILD eselect-chuck-1.0.2.ebuild 521 BLAKE2B f26c2330f662bf5ec67a5587b9ba1da4aa7d50be3d78f2af226d4fee27a1514ab153defb3f01dc27c7fb3ed91f6350a20f5a40b6bff5e159cd16ac760e941d53 SHA512 1c98fe49da555d2df5f363ee1ba939d7aaa6cfc7997b2b6d54a67dbe915755418da5c4827166b127b665989bec5d5005f41bfccf2a0b594aa3a768b0ca22906b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
+++ b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/chuck.eselect-${PVR}.bz2"

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

 RDEPEND=">=app-admin/eselect-1.2.3"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@ -1,3 +1,5 @@
 DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
-EBUILD ibus-hangul-1.5.3-r1.ebuild 1001 BLAKE2B 7d007bf60bb77d245c2121e987e72e87037527b60060dc89bbb23b500c9fc0d06d0c6005a16207fc7a2cb01d321a34f0d3b17e07b9a086ed664ac51a43865c06 SHA512 d400092fc0c62f43064227fca1d815a4ea19b66588c92d3294f3dda9465b59fff8997ea2a70f47df3230fd13e4defe0c990a777a896a0d81e0484a9e95cde5c4
+DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
+EBUILD ibus-hangul-1.5.3-r1.ebuild 1002 BLAKE2B 41dc55336a59298475ad06ad3cf631a8c17b207fb394a7c8deff57ab5b973abb212f5b4e8c1723aa3278ed078be35faf5d00b7bae9aeceacccada1fddb9e6a57 SHA512 175ba4d2830ad9ad328cb41f47c6017196b89d4c32d354b200d9e1973504aface6dbfab24830b5b4f39f7e37564519f3ee624aa42a14698f7a410b888e55b7a8
+EBUILD ibus-hangul-1.5.4.ebuild 1004 BLAKE2B 5f4ccf4cf6bc6dafb654c3163382914dc922ca686a5e701d2fef5e427e20a4d4188b92887283037a0d23319766cd88a346ff8897d7e92c490c5ed6d5b8c82e51 SHA512 56a8dcbf69dafb7b189e0ea4821568a64f0f74a56a6e0ccec3b95ba9d14552a5b53d0769cd4467fe0a28d4d14d469f5b223f06221607ff05d4b684a208dd44fc
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
@ -10,7 +10,7 @@ DESCRIPTION="Korean Hangul engine for IBus"
 HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
 SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/app-i18n/ibus-table-chinese/Manifest
+++ b/app-i18n/ibus-table-chinese/Manifest
@ -1,3 +1,5 @@
 DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a
-EBUILD ibus-table-chinese-1.8.2.ebuild 747 BLAKE2B 529e69ecb824a1ae7d5f4b0e45236504690151e5d68c73564539232d9187200d91abcfea835e051bae12f77d9db398bd5bf2175fd2d516328b3a55710dcef87a SHA512 68e6bed7692488d771ecaf01dcd99a35452a4b9b709cc1565aead88a3728b23bdc34791dee695c1f4ef530ed171be2abad0cd429827f4527561d63fd7147f56f
-MISC metadata.xml 315 BLAKE2B a6f24959fcc2474a02a6dff5d81b54509c422cf333913b8120c8b93cad7f4261e58a5b480dcbb724559ec4562a7a43f1281ac772e7fa2e6e4c46393fa7bfde10 SHA512 ed671457e0df484fa4bcdc2673dee882b805fee5a912808d9b25ae1a201b443b7d5f29fa012f7fbb98e7195ede5f91583e907415b83279a9f034bbd65e4328fc
+DIST ibus-table-chinese-1.8.3.tar.gz 10824912 BLAKE2B e9f4e377a794827196e04e197044b3fdcd81d84ed89067e17745879495df69cc6e95814863f856cc0a7b7db0aba3cbd93d1c1d172f607fdd410dbed02dc4ad54 SHA512 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc
+EBUILD ibus-table-chinese-1.8.2.ebuild 731 BLAKE2B ce48f80c7feb47b4ff2a0720e327faf322ebd180cfc022f4485d9a8d7da9de6ac8a480f8f3fc4beef1dfb811b15f2debbf4582c4a0f8cf70df26c985a32ec954 SHA512 13f1884ea80789b0436f3a993cd784fec1ac0417007c2b131ce3c3ce12e57c94b442d43e07a746c980360a910df7797cce9f11fefda92f6f5255ddc14f150212
+EBUILD ibus-table-chinese-1.8.3.ebuild 733 BLAKE2B 2e5b2092d7f6393a7d386e045444de81b7b0664744e085c14b2f70ecfac1e3371770a582172e74a881ae90823cf890369d3dcc033aee0f09aa3f0e20d6916ee3 SHA512 b691aea0d21000da67bc3a3c868c5db5d7b96799fd276092b9e43d439df9a15290ca98e599349e46511474abfccd9773b1438dbf6c888a04e20963dd56cc1e20
+MISC metadata.xml 326 BLAKE2B 8ad6d82690943dab490281b7528bec1206b13b15ed17c1092b82c7c0048888aded24806b286e87c64d211b1764ac39be710610d3d6f03915ba10c3b0cf887206 SHA512 936333058452b0857d987a7b56342defee9aef0f6b1bc689bdb8fc0b8c52c8d15765e013fb03175af8b8f1fa94adab214e2657d588175656b23de1c4baccd487
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"
 CMAKE_IN_SOURCE_BUILD="1"
 CMAKE_MAKEFILE_GENERATOR="emake"

-inherit cmake-utils
+inherit cmake

 DESCRIPTION="Chinese tables for IBus-Table"
 HOMEPAGE="https://github.com/definite/ibus-table-chinese"
 SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

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

 RDEPEND="app-i18n/ibus-table"
@ -27,5 +27,5 @@ src_configure() {
 		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
 		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_IN_SOURCE_BUILD="1"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake
+
+DESCRIPTION="Chinese tables for IBus-Table"
+HOMEPAGE="https://github.com/definite/ibus-table-chinese"
+SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table"
+DEPEND="${RDEPEND}
+	dev-util/cmake-fedora"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_FEDORA_TMP_DIR="${T}"
+		-DDATA_DIR="${EPREFIX}"/usr/share
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	cmake_src_configure
+}
--- a/app-i18n/ibus-table-chinese/metadata.xml
+++ b/app-i18n/ibus-table-chinese/metadata.xml
@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">definite/ibus-table-chinese</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">definite/ibus-table-chinese</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@ -1,3 +1,5 @@
+DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
 DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019
-EBUILD ibus-table-others-1.3.9.ebuild 545 BLAKE2B e0193a288ccdc97aed4e45ac3c589f351d1037d19987948773d029ce92068b221de6f83326a6b2c14bdc397e8d611005165242a41a6c43cc2e75217e0502beaf SHA512 0f021b7df750474f7fb0f0f79434f6a481a50a7e52453818e72ea6be7510a0936ab4a4da2c473975b2f4151701adb427f93f5e54ad01143de4bf60b314debdd1
+EBUILD ibus-table-others-1.3.11.ebuild 552 BLAKE2B 1b430d48647bb709d400f599f734b835a924b31c65b8a139435c5ed8d8271aa7c30ba413738aecaccaedfff352ea55e70ba25e69ff5728c89cdd626d1b786b2f SHA512 8e0e686cdf3fbdac487bc9fa31009ff4f9ed60c1959a16219efe95a4ebcac935cde576cbc405963efddd9dcaca1444f89986940a52d2530338e9887871a64eb2
+EBUILD ibus-table-others-1.3.9.ebuild 550 BLAKE2B 00092cd76c017e18c6a51b55b420310f1ffd4857eac41b43ec55d2b3f708d0157b691b598c667874442eefebc47dd98a2652f4a66b514a77a7ed71c06ef5b59e SHA512 771619e90c05391279adf17213e2a66c323dc5927f25a73e1cfdc55886155ebb5f310bf0a81b9b344c1eb500009921092be0203715d696851734ceb110b17624
 MISC metadata.xml 641 BLAKE2B f397b2ad570982358e1eb76c061492976b937ab66c83eabfdc31c6e618f65f869b4f8488dc9d3a81c0a48fb0d84bd6c13af2fadb343f76b6bb2c75bdcff876fa SHA512 775e9f2f353f8bb9ed2a0aa1c6c8dff98886c0e28f10c87136f2b67f5eef9eb0af3b5d49ea0b1eb4ae5e09b43fa0987b8195520db844e0d20d07f0593fbe6b96
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Various tables for IBus-Table"
+HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
+SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table
+	!app-i18n/ibus-table-code
+	!app-i18n/ibus-table-cyrillic
+	!app-i18n/ibus-table-latin
+	!app-i18n/ibus-table-tv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

 DESCRIPTION="Various tables for IBus-Table"
 HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
 SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"

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

 RDEPEND="app-i18n/ibus-table
@ -17,5 +17,5 @@ RDEPEND="app-i18n/ibus-table
 	!app-i18n/ibus-table-cyrillic
 	!app-i18n/ibus-table-latin
 	!app-i18n/ibus-table-tv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@ -1,3 +1,3 @@
 DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
-EBUILD gnutu-2.9.ebuild 617 BLAKE2B 8888b504b4db24d36f7d366a7d1dc3efcdd9284f178ef99c679b3f5e015999a3fe886f29730020d109c1c38743c9c6800896e1f3675631a5447e8795ee7fa17e SHA512 59769a6f4eee6baa0eb7deb6187d1e33e0be41659767e340d7273a0ad8ce97b2d1d75f8962f73d43a25ba67fda81444ca68b080977193da66fc05011a678a543
+EBUILD gnutu-2.9.ebuild 616 BLAKE2B 77cdd01c72fb988f42126616fd84ebe2cabfc0bb8a7eb7268375141b78d5172aa6f74dd3be5db0b74c389bf188584973f8c34807d094e34499f882c83361408a SHA512 5c1543c4bd31f5f4030c19ccd90cd378e3c38c7c5b1ae00b96f1a41e2fb4d2de980b62b18c9b483d4bb0249040293b256d2827fdc896c5deebcc564a4f00fdb2
 MISC metadata.xml 1074 BLAKE2B 6c0522bee38564ad715c44022803d11f1999c5774ff07aac9ee42259a1bda24c024bc0f83e4c329dbb4d3d9e380aee4df61af9ec41dcd17064a3879d7b4aa3c9 SHA512 4e9df2df20f654d87bf9b6a6be9d873129878f610a25f08446135f8fc7ac74ecb35d7cef3de0aa06cd2b19768fd5bcd9d399d781de11533c8064d5cc61a2f0d5
--- a/app-misc/gnutu/gnutu-2.9.ebuild
+++ b/app-misc/gnutu/gnutu-2.9.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://master.dl.sourceforge.net/project/gnutu/${P}.tar.gz"

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

 RDEPEND="
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@ -1,4 +1,4 @@
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
 EBUILD ktoblzcheck-1.49-r1.ebuild 884 BLAKE2B 12fdd58f04418b90b32ea4f83aa1c652dd73f9ef64d91915a86552eef9439938413dbecb9f6545f10f97eba70e77eb6f26e572264feaed42d28dfa5a73f121d9 SHA512 1e48b63552c974266cde28b61cc87eab5820f05e8486e7918989ebfcc22c56b13f169fc99b9b58b1318e7f92ab71857b046fe67616faa3264e28bb49f8aef04b
-EBUILD ktoblzcheck-1.49-r2.ebuild 688 BLAKE2B 62ace1bd72efc12996c2c97a1b44bee2d821307a850617906348081513df3f7a8a8d6caf6153de2e9fed1cc97a8097af87522c1550d5e4ca7e9978d0bb8c97ad SHA512 fd71ebba172db8db874292454689318188c634c15003ad3d6db8299fc2b55faad55f117136be09316b3d66f3a8a3f058f455d6067665300bdfffd775126c2447
+EBUILD ktoblzcheck-1.49-r2.ebuild 686 BLAKE2B 47164f43f697f95089708e6a55f177a191ef0f58f3ac4ee0a60a226d9f35074d8efcec5914c17579eec33d156a5d6f8ea74382bfbbba3a3642978d999a7a1c67 SHA512 412a8884467cc18848ff223937c290b18c0f43c1e1335c168e7d5510bca70a40fa7b9dbcbeebf48a25a74ea1ab42f3abaf474694dc62b3350211b9048a1dd070
 MISC metadata.xml 297 BLAKE2B c7fe2728b531d1325f0335b85b9fdf9b0cb828780ccd279dd516af6036ec17f5c0416564b50e1cb972690a43e6a250f0c120dd90e1533f36d6077508214f4133 SHA512 c4c121f254990adfc30d96af3e0d58bbf937863f521422d759779dba224f3eb6a904c7e5a03bdd65e25afcc0fd67fb8ffd84566799771b1c73bf7f43d9c92c0a
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 RDEPEND="
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@ -1,3 +1,4 @@
+AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
 DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1764 BLAKE2B 27c58b0eb22bbd4f3a07b8922a1e1c5b8bedabe5a02958cf92e936bf96339a2e360b013fbe74db245b41f4f97667bfcb0e218805f76ac6fbede1c9cba36f1e8d SHA512 1c772f0b27c03f49462def5082bcc4f11a23760efcf41dd74f53085f7b8fe98aa290950312b4794c595df58107147c61dcfa89559b91749ecbd92173dc8d53f4
+EBUILD razertool-0.0.7-r4.ebuild 1760 BLAKE2B 5372848aa026321c7f9f62bffc6b4a1d33526713852ae5a0e47c3563eb7bd8a2c3f0ab88a4a8407bc6dc5956ee6f767cc604a038d16eff0c819087fbd714cdfa SHA512 76d01f704a4ed0238820d865f5bc522c907935d72608c52e8e97e2916edd4aa38380731f75aa591375448f4c2b20c443a55face93a32f21490dce757a17fa610
 MISC metadata.xml 669 BLAKE2B 033318e57004d253f5cd774cbe6163ef84e800a04c75c9115dff3877857e36d5062a0ea898fdabb2bdc5edbb3c3c3682989f76168051ea1cc1091b54c9c38749 SHA512 e14e8d1b8af18a78314722909095c39d5db6edc0c87a0eb15cff01afeebf7739e6d8eb5b96089ca4a4138b207d8de7a95e6dea76954bf4026682f65659403b12
--- a/app-misc/razertool/files/razertool-0.0.7-ar.patch
+++ b/app-misc/razertool/files/razertool-0.0.7-ar.patch
@ -0,0 +1,11 @@
+diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
+--- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
+++ razertool-0.0.7/configure.in	2020-09-03 12:53:51.991020189 +0200
+@@ -10,6 +10,7 @@
+ dnl checks for programs
+ AC_ISC_POSIX
+ AC_PROG_CC
+AM_PROG_AR
+ AM_PROG_CC_STDC
+ AC_PROG_RANLIB
+ AC_HEADER_STDC
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r4.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-inherit eutils
+inherit autotools eutils

 DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
 HOMEPAGE="http://razertool.sourceforge.net/"
@ -13,10 +13,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"

-RDEPEND="virtual/libusb:0
+RDEPEND="dev-libs/glib:2
+	virtual/libusb:0
 	gtk? (
 		dev-libs/atk
-		dev-libs/glib:2
 		>=gnome-base/librsvg-2.0
 		>=x11-libs/cairo-1.0.0
 		x11-libs/gdk-pixbuf
@ -27,17 +27,21 @@ DEPEND="${RDEPEND}

 DOCS=( AUTHORS ChangeLog NEWS README )

+PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+
 src_prepare() {
 	default

 	sed -i razertool.rules.example \
 		-e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
-		|| die "sed razertool.rules.example action failed"
+		|| die

 	# plugdev group may not exist (created by hal), default to usb
 	sed -i razertool.rules.example \
 		-e 's:plugdev:usb:' \
-		|| die "sed razertool.rules.example plugdev failed"
+		|| die
+
+	eautoreconf
 }

 src_configure() {
@ -51,8 +55,10 @@ src_install() {
 	newins razertool.rules.example 90-razertool.rules

 	# Icon and desktop entry
-	dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
-	make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
+	if use gtk; then
+		dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
+		make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
+	fi
 }

 pkg_postinst() {
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@ -5,6 +5,6 @@ DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd9
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
 EBUILD uptimed-0.4.1-r1.ebuild 1572 BLAKE2B d671cc82a3e76873eaa2ae175208196157a4bb9fcd0edb0ce94ae6328ed399d2537709bb079bcaf156682161d7578a533e817b35e0d81cb9f5120f0bfce177b6 SHA512 cba8c853d8bae0720a8c9c8a90b9e2a6be75be297b6840ec04bc5f50351117941b95ff2c74e37e520ee5fece5d631e61c5f7031e39fbb9bec9aa693f62fd9ab4
 EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
-EBUILD uptimed-0.4.2.ebuild 1606 BLAKE2B 816f8ebf1e49e81716049afdaf5917647ae295209d4fb209e71e59234dacf4db4a1031edcd92813697ca660a5b21c89fc85d0c71ca7dcb9061d5e5555712f2ea SHA512 2fa5cb41761637098dc211e817e0966211c40623292c7a591bca03f48b05066ce69e3f2dd9b933dec11b7958eeb433a8967215d93d830063aa386fc4b3d825aa
+EBUILD uptimed-0.4.2.ebuild 1605 BLAKE2B ac3f1ca7f6873d183ae2933d37f1b8fc38fa79aeecc577552a6247a905ece06d63c3e832bec3d7d9257a36603de718ef65230265388c47100d9f76ae3ce404b5 SHA512 c3bec1f0b2ce5cb930c6bcec12885d2ead43bf4bdee35bb521f84fa32f280207c27db8895703e4f5ba0c2fdd35d534d1414e41678bc6201dc3f870d7339b1b08
 EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.

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

 RDEPEND="
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
--- a/app-mobilephone/adb-sync/Manifest
+++ b/app-mobilephone/adb-sync/Manifest
@ -1,3 +1,5 @@
 DIST adb-sync-0_p20181127.tar.gz 13952 BLAKE2B b9097f44eebd76e54cee41f097933f85151399e99275268274252b53f47ab241ecb888f3631dd9f657213160f02e9f3638d782fb24de8e38631d0e2a81b6b03e SHA512 007b9ec089170f3e679a26f23952043ad922a2f988532183200ddd15792858d4d38c6dbd617b32ff0e17d01b37b246c173e4a3f8c008f7cf4bca551e64cd0ca3
+DIST adb-sync-0_p20190101.tar.gz 13956 BLAKE2B 380109fa302fc5376de8124aa31c3fa03a27ece22d7f2d74638a5387820ad7c2b294daa6e8185f6eef49524e987d7a7f1222a1ee3b6550247993ebcc7c1ac98d SHA512 8bd5eb514c63327860017402f509231a0882cd3624ed3350039b2383f38e503abc6cd319ff41a47d70031958b0b38b973c36272fc4af6e69cce54e15e6bb6990
 EBUILD adb-sync-0_p20181127-r1.ebuild 718 BLAKE2B 9efd5a0aed0e299d5e710fd29c286ab41f7ffc4c8665e2f6b02dc32a924696b745ac337d40a3c153228b28380f6358ec86400fe2023ea2dfe9f2ccbf7b8838df SHA512 0e87cb5d3ca8598c3b93a9874fef68ed7e53f236859679732883602cf3779b79e0c78f3bc3fd6ef9d74042ea5ea63363fef3a8598d1a78db55277fcc97760ba4
+EBUILD adb-sync-0_p20190101.ebuild 753 BLAKE2B 1337750e5cbcc15b762cc0c18e3dceb6e079d7b73696646838d427638969dc4e50a7d22f91e89e0ff48b16d61d25705dce97f98a82c09bb605751acbe03516a5 SHA512 bc07953f6d675d5400ea15f6603155c606fcafae5465acfbb18418c06be758d707cf5ee8cdc0354c7552bdb561ab0086b2dbe0e643cb6f069ec475ccf4aa76bc
 MISC metadata.xml 483 BLAKE2B 0b7ef2215754e8d77ba39a0ae635d74ddefab07eafbb00c5a1a806eb533fdc8224edcb0d0100c70017c4af3115db22dad81e66b9c37a3c89bb9928a023e518e0 SHA512 f4be0d74af3c6fa0a982de8c3410c2c4fa0f19dd77d368ddce8169e9c3db4e2a89c01d8c651212851e2a30e30b5b5133f8c740ce120bf8cff5fb84ec68c11bd7
--- a/app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
+++ b/app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+COMMIT=fb7c549753de7a5579ed3400dd9f8ac71f7bf1b1
+
+DESCRIPTION="Synchronize files between a PC and an Android device using ADB"
+HOMEPAGE="https://github.com/google/adb-sync"
+SRC_URI="https://github.com/google/adb-sync/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+channel"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-util/android-tools
+	channel? ( net-misc/socat )"
+DEPEND=""
+
+S="${WORKDIR}/adb-sync-${COMMIT}"
+
+src_install() {
+	dodoc README.md
+	python_doscript adb-sync
+	use channel && dobin adb-channel
+}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@ -2,5 +2,5 @@ AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a
 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 EBUILD lyx-2.3.3.ebuild 4096 BLAKE2B 2854d008f01580d04ba6bfce00cd92eab9b69795e3d3627c8c763f545a04343525e3b37bf2f11fda31f7f0ff7a894e1edbdb1140c7abac0b9e98df0f02c177f4 SHA512 5749fdb27e9766fba637a88cc5ce6c2c7cf3207b809b2e9c336d4473ebd5fff7511714032bd6a84d985c10631ecca9d9186db0364a990a3966063da8ac5d160e
-EBUILD lyx-2.3.5.2.ebuild 4051 BLAKE2B 05e87e24a0587419160612cc8e648b02281f1e2cad1dda372bc59f151ead1fd3b6344db2410dd536213088e8a8c528c0875ce79e4a33deceb27d7077aeec20e4 SHA512 a471442b92b5c7469ec0255a77bdd56f6383d2a1d92d4bd51712977ecb27f54df78730681b8debfd2facbdde6d39dd81318a0e15dd4a1f65c0cfd76a765ebf88
+EBUILD lyx-2.3.5.2.ebuild 4050 BLAKE2B 69ec08b5a056208c50b1cca33f6167814843f76c27de6f86a932184899dcdfc5140578ce3012af6e9a5c8011adee60a21b788053bcb9e3d8e3aa7f662ad9e3d3 SHA512 d8177274490ee107d2a6d386b367621517b5bf6a2622b07280aa99a700d0caf89ac2474aa1e3b371da8032d9d86913bbfbd889c2c373dea8d9768fab7f7a0ba5
 MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e
--- a/app-office/lyx/lyx-2.3.5.2.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/app-office/projectlibre-bin/Manifest
+++ b/app-office/projectlibre-bin/Manifest
@ -1,5 +1,5 @@
 AUX projectlibre.desktop 252 BLAKE2B f534e42ec22ec4e6865977689ef6645adff9d092f055e8526ebef164f11d8e342cccd5f5c58fbe8e25af39ede9a226d3640946140167875cdfe9abc6abe8ca1a SHA512 529f368924efdbd2fe330982fcb4db010ee5985d9e7beaa0bbf0490a85e3ed477cb7de4d33d1705ff01f32cd477d7eb8adf84ab82e5065865c6b341614a4833a
 DIST projectlibre-1.6.2.tar.gz 14735171 BLAKE2B 1e69b3be153eb936879e930cf942faf0061b07b57e43db74f2f8d9380bbff969d764cbf70b29d5d38edb011331337258681888a5289b8fb04a997c0e38f1b651 SHA512 128319a37aeeb4603fd45433e3961805b0de30e5760394d5eef2de1910bff3815e600462aa3264fa64df55eb8568849895c9d673e5574badafcbc1df89e2c9e7
 DIST projectlibre.png 7955 BLAKE2B c8d35e249b8961d7a5d1a6b20844b30cc8a564c69a85791a036a05779352b24d1cc3956c6c7b83941152e06ece0ef1e0a1ff74231e47bd1efae7d1e20dc83764 SHA512 db6e87e74fac3274be34b36cd9daf7231f06e19096cfbe2feeb616c1ae1a60ffc838a81b45b94621d806e00ef5e220391f1d1be3148f9895aa467fdbcac62843
-EBUILD projectlibre-bin-1.6.2.ebuild 1021 BLAKE2B 03da3f3643797c91defb08ea42ab342b356f62a19ccdbf4709f08760b07efb892a88ff51a0ed098afa65a52cd90a5cb2ca6009fd79caa0cab6d180e19ef0330e SHA512 8fe568f4fa4001468a83e5da9cac8984252295b93a89c94381bc9fe1bb1f83fc6ae09f7fc8de5906b23a91bbcea1588899af9f54d6a4d53de3b590cbe350f14d
+EBUILD projectlibre-bin-1.6.2.ebuild 1022 BLAKE2B b04a28d84c16d4843f4955c5885bd414583395d070445c108cd390c4a0b4c1eb161bb4ecf49f4d2d22067baf16339d099684535c307bb0672f9e6d6ba1715e18 SHA512 664e6b72f99158a3c0d9565e7088964a406b366d7757e08bca740a7af5e752db6ed3b55937139af9e368a518c5592396d0eed60f2df1be61359b55114779e2e3
 MISC metadata.xml 249 BLAKE2B a92e8f0d53aac2a1a3e907d47da8a2d745c6832c829f7bc248d82821c7ba39093c1207b19c6c86ae8f66591274790b8d4a01ef1d439a0ed57bd4e4c18dac70d4 SHA512 65f6cf55d429bcce486e2299b126e80f93de5cb94fc687ff8922766d042ec6bbdcd336682f474b7be26c0026bd0afe3be78fae657d047a184c8354bdc5dff591
--- a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
+++ b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit eutils
+inherit eutils xdg

 MY_PN=${PN/-bin}
 MY_P="${MY_PN}-${PV}"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@ -3,9 +3,11 @@ DIST portpeek-2.1.29.tar.gz 13067 BLAKE2B c0385849738303a3fab8123f6af321bd000f88
 DIST portpeek-3.0.1.tar.gz 12906 BLAKE2B bca14b3d1c82b270a5418ca3ff1e5422a16251bd5d7ef775311c9bf86cbb3b5c1304c688c0631247aa1e6f479d5e7eb5313c83fac5a9e197dc70bda6aa48b569 SHA512 8e0d71d71afb6b6d990e88f3c212a7e999b544cdc7a06d44cadb59ae3b70849fbbd864d855f014bb4090a031efc0713c84dc2a3079e37ab8967e546c8d165394
 DIST portpeek-3.1.3.tar.gz 13698 BLAKE2B 67b37e4e02a178076bfa57da850eff7cdf2664e34ffbe287daa92b5db924d17f486eae078b7d09e497a2a6e21588134e8167d113d6181d9b3760ba7e20fa6635 SHA512 31d85e9d8c742409a7429695dd73a49da6d4b3fce67716b2e8ea766df95e130e16ef5cc05c4cd27278d51956e9b78fd17eadbf615da1e237a15e0649dba6b5e2
 DIST portpeek-3.1.4.tar.gz 13703 BLAKE2B 9afba0c81e63761160182aaea5f505e640867936e0ac982bfff15dc7c8ae201eede211e04f29b832d8989f9b0e63789234fab08c9cb073ea0d4c7fa96d87d90e SHA512 aae4d79d32c6a8c0bdcce83e3ea67235007db96cc3655e26861b11431bea1e7ac3cf90bed12d3f79cb354381f0590ed0b409c2c7593717ada8b2bf8d8ae4de37
+DIST portpeek-3.1.5.tar.gz 13501 BLAKE2B a22b039e77d3c72c0cfd71e6abb097ed7aa6f0d4b00bb3c4108bda2980ceceedb21d75eb630cbc8eba2d842fd4cbd77c6e8e54c4c842351d2fb86251abbca522 SHA512 8245e40f9a2fada1919583a67de13ba2b6c111c85c9fd0a02e9177e188e2d8edc42882685399f4c61206d4414d4a8296e93d51d4c45ddac0fc968be43a13c639
 EBUILD portpeek-2.1.27-r1.ebuild 691 BLAKE2B 82344fbb0c1255de4d20baf9dfb62daabc77da8ef290bbd6b342195b50f7fc46132fd21b77eafc5fe5d5338618d6bef8fb4dd3f21f35e740d68213e1d71bd1fa SHA512 eb0f940e006a32796b8ea47b9deeec5795271846ac1678132d45abed8cb766d801583b4d735dff540176b0fa96b5e5cc4da386cb058c9d5bda17d57e5440e1e3
 EBUILD portpeek-2.1.29.ebuild 696 BLAKE2B cd0c7d39b0775ea6f7a566a9440467bf9d31eabc2cc4cf4f9a18ca676b466ebaf947816cceb988b79c66b5c3cdc119ffeb2e3525922d397d720367862ef75c9b SHA512 e3001270e57e40d89aaab66999d6b10e3b4347bdd17e35b90fce0a5bc0156bbec39fbd0550bb8fc19119c7f1643410b3f2cd97077e7d336c539eea035fcc8316
 EBUILD portpeek-3.0.1.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
 EBUILD portpeek-3.1.3.ebuild 693 BLAKE2B 3e3cc221f2d54107f8493e0fcc0dc6b4359e18d55740993798aebbf462cdcf1876e8e8996156f3025c74e937272441b1856e2cacefa1631174b4fafb263bf761 SHA512 17311479ba6da7b866a0bf21672b924b6623e447b065ff7eba371724c78feb0ad7d0ba07c34fbfdecbe43e7e332b6e155ba0e13b6032dec4434bf3d1e17d7e14
 EBUILD portpeek-3.1.4.ebuild 688 BLAKE2B 4826bce737f85b90a9b581a7983fbcea9b4a8942ceca63bdeb2354896deedf58e4fbc66c10bc2d86712c3afffa2228f880e4c28e91784fe4e3cb21e88d5f72f8 SHA512 87ac82a3ec30a404f2bc6c1e77511f27e00f440811f55d900fbe50374df761a087090525e99cd614e69d952daf016f17f4b83b855a5bfb74add871a6c0c80aa4
+EBUILD portpeek-3.1.5.ebuild 693 BLAKE2B 57fac3b612e8702e4ddf56335a75abab4ec1b33023c4f113d54e39165797041674855fcc1bf937a4c18cd5511fe79713d7734199faa46ec79ae11bf7ac99bd63 SHA512 6ace8fb61e32f1474f1d608899f424f23e3effc12d990571ba5cbab4c14d5df177ce8824cba0b9be85ac05f5e4f0f2e9de11f0bec9cc74e8d6788b411838b70a
 MISC metadata.xml 247 BLAKE2B d6a36f1ceb3124edcff52b16e0893bf1984a3615da55fa5d160ae6faf816680dd7e735c3b9c5088ea101aa73501b4492553003771190867e35dbba8413d5ea7b SHA512 992dfbcdbf5401accacff7c9506d06cfd10555546cd041211755a90664a107ddc99d5d6b2b429a241929fe8895a0d5d571e3821ac0395dda10ed22cad60cb1a9
--- a/app-portage/portpeek/portpeek-3.1.5.ebuild
+++ b/app-portage/portpeek/portpeek-3.1.5.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.5.0
+	|| (
+		>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@ -1,6 +1,6 @@
 DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
 DIST repoman-3.0.1.tar.bz2 88134 BLAKE2B 270eb8c6220360d32076a402795df9bb1c7ce7ca6509707fc2b9307ca94b59131da3100b51519bed2f76dde703782db6ed74a052b51ea48c690e6558ceb9d24f SHA512 2da130a5dba547390151620f7e944de45e0a880165ab138000870661778f54c6f6c2e0eb61bab961a0cf17642a96fc8a2e5e508bb16cc1adfcf103074838196c
 EBUILD repoman-2.3.23.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
-EBUILD repoman-3.0.1.ebuild 1975 BLAKE2B 1254feab2dbd492db51c7b78af68455e55f3c8f24835dec1a745e483534e12d651f0f17fc18733897c876a7b3a66d9b625df358340f62a49c6a4b05483e3b4fe SHA512 4637d0365008aad5ee2015689e8d5dfdfb88c527040ae2800c9924f38698aac787884f43c096edd821a8941334ee515642dce6dfc1883f0b462e2b7d1c22b4eb
+EBUILD repoman-3.0.1.ebuild 1972 BLAKE2B 62ff3d3b41646c51a0ada063441972ba224acb8a7464ad8e4241914d551ea8ceca3e08312a1cb3339324236829f2391253759c1fd3b4af60c68ddc32af94de5a SHA512 f1063ab5ff0f9630c5b68aee8185e5d47ec2ed3516b4ca7ddb942987094ba2d187f2f98356470c20551a2fee9b94cb50e76054864016d4d39c426306a3b0f395
 EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
--- a/app-portage/repoman/repoman-3.0.1.ebuild
+++ b/app-portage/repoman/repoman-3.0.1.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@ -1,4 +1,4 @@
 DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
-EBUILD tatt-0.7-r1.ebuild 831 BLAKE2B 89842ca9be4a6c16f2c0921365e522c935ffc705a24166c879ba264a6784c7e32a5fd33b580038f6f64070870bc32118af60e4ab9929817082dd43b23c4c1250 SHA512 2ef85bcd8ff1cd2d964d6cc5e814da50856964f80b245a9cc3fd833748515763fd188558ab63fbb24b65c655035e204d7a076bd5fc50c4b2dc6389281cfcb239
+EBUILD tatt-0.7-r1.ebuild 829 BLAKE2B 298cb4ff4d32c3e9e18f00503ebdbf1f1131107fc2edb7b57926485db94a48c42712fe1669999acbf0bd43846abe7b4cbc3a788d27a549c6040cdd634b537ce2 SHA512 47ba8c1e5609a4c730673d3e7b1bec78e4d38265522f50dc2985185e66fc55e0b635cc4bb9cf76259d7ffecf3ba30c3bdd156c96c118816691cd90a54c954c9b
 EBUILD tatt-9999.ebuild 794 BLAKE2B 264a6d81711af89dbae0286b566ac9c57da3dcdcdc738a281a6fbc0110a6995367775205d96c98e1f78764f12519601b560ac3a81b506d03761aeac22bfa4eb5 SHA512 c751805637179a9a61dab118cbc3e8a2dfc824c0554ea91014acc8333834178b3088597b4cf0278b169af3b516bf6b96f5d07348a9f0413472799bd110c18895
-MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
+MISC metadata.xml 665 BLAKE2B 74e99880ecd72d4458406ba6264adc9d2e8fad7ce71edfe265c079b79feb29a022c646369139772780c2ad20990e8816716f994362aeed95af84bad74fe0ce4a SHA512 74d566ab626e3c241bf63d6b1279765aed601a3654a727989e5b9e11c3edf1433107100cd9e55d90df9c84a93e3eb361c4563ff36d4c2edcabf44e0c4c7194a7
--- a/app-portage/tatt/metadata.xml
+++ b/app-portage/tatt/metadata.xml
@ -14,4 +14,5 @@ It aims at developers. If you are a normal user you will not need tatt.
  <upstream>
    <remote-id type="github">kensington/tatt</remote-id>
  </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ b/app-portage/tatt/tatt-0.7-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

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

 RDEPEND="
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -402,5 +402,5 @@ EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1
 EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
 EBUILD bash-4.4_p23-r2.ebuild 5678 BLAKE2B 9d8b60a26838050aa18131b6967c6a196559b9521789d1a82f1ebf8dd42eb6a1ad0c4a0022c4046021aa120b7b3b9dff15c91f0b2ebd601a01d7878cc82bfa31 SHA512 608c289575ba3eeb3417c69557888b317da4b9189551db87a5e3484274201b3a4ceb5c61cec01fdfdd0374d6eb46420eec4471ef46430dfdf56475ac43ea3d35
 EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
-EBUILD bash-5.0_p18.ebuild 7305 BLAKE2B 60c8a100e9119bb510c416ccd9e2532afcd1a7d6b61a15dc743ead4b87adeaa17186e6231772a9572d44b5f4d4fc796f95fb808d476c3fa230e7323189ca35f1 SHA512 f83a0d2c9eaaeb6c5cf626389c9af4a8756d176dc2235c50a08c4a990ebeb0727d7e3306dd221a10c348ed0c429f49b80a2bb399aa9a16d1256adb4e5ea1e082
+EBUILD bash-5.0_p18.ebuild 7304 BLAKE2B fcfc64bd1b9a6a4dd324d87c9a411a8a2ee2bf541ec64ad59a192068e40b8f3db13d2ee818c287cc8bfd4b035ee65fb207c2c2f9a02bc734179ae389cbcd2fe3 SHA512 ef7c9b35634c079f581b54b292ed25d19371b7892c15653f278d5cc08ee81d35bf3d959722c181f314b0d5948e2dc9e90e0afa43bfce351a8759135a71ffa8af
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@ -46,7 +46,7 @@ fi

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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="afs bashlogger examples mem-scramble +net nls plugins +readline"

 DEPEND="
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@ -4,6 +4,6 @@ DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b
 DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
 EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.11.1.ebuild 1522 BLAKE2B f578265951b2f4120b8f1699e2043e440ba6a11cf8d6339135e6c43f37573afb16d30a6d3fec3953f8b1aec9c5bd0114e54d0f6f4d7b494f0c54e745f27510c7 SHA512 8ef211dd5d4d40b56f752cb7b126660bf011ec354a2c64e181a43e866dc7e49a836e0661a2c353e77de464be4cf6a274f33a7ed06ee762ebea0e543435e2dcec
+EBUILD dash-0.5.11.1.ebuild 1521 BLAKE2B 4c5f48602cf369d52316295260aee45ae5a7fcfcc83d4323db37b97dc1c040601a8cd5a52b9bae1c60f4f6f89d8294a56c73344d18a6b09a16db4e2dd7867863 SHA512 dca19866abb5ecee64b869e36a588b9b96a5304753fc8cffe556559b4823549b4816fd6a59d019829a187b4a1c9ea5108b970a503a8cf304a09d081b8c1f3abe
 EBUILD dash-0.5.11.2.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
--- a/app-shells/dash/dash-0.5.11.1.ebuild
+++ b/app-shells/dash/dash-0.5.11.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static"

 BDEPEND="virtual/pkgconfig"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@ -4,6 +4,6 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.11-r1.ebuild 1798 BLAKE2B 34e61d1fcc33323a2da173e2a07ada90ee89dc6c2f46a6f6ccc0a1cfea25a7f2f19399708952124f6003026f6acb77782940e485e18e611873079cf8d141f0ed SHA512 56bf72d3d35a82e2dbfbefe6bbccad01cc00bb05c30d9d7ef472d00e0b457a948418944f05398ac6719ea6a285ea5c11b7cb4328832dfdbd732bc1866386c93b
+EBUILD dblatex-0.3.11-r1.ebuild 1797 BLAKE2B a13ec5535084266af9efa72660036816a7d65a98a8eaf8dc162eddc6c66c83af67fbcbc41e65dd925e681bed4be700f58e5133aebe152d66757805b6e7795878 SHA512 26e88935b1415f310081fed1a2cad87960d3f24c92bc9728d6938e34fd4d0bcb92df281533f3060bbc594e1cec3fadaf31be9680cd9b7f115fdb3055921b0e8f
 EBUILD dblatex-0.3.11.ebuild 1622 BLAKE2B e22f30327fbec58cf69839f1aad790aab5c024bf70df5faa3b4f5eb75e6619b6c3b35a9e52e8df0dab0d942b71c1bce8836bd1a468d2e66992b8fa90fd1d3a46 SHA512 25818584313360bb615da8a8dd6c88f6fe8ea41066e564d8e59849aadd30e0b2f13ad1b2aad511deaf492179d8b3e9d64b71c105793de7ca07f395b02a8e961f
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.

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

 RDEPEND="
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@ -8,9 +8,11 @@ DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de
 DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
 DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
 DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
+DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
 EBUILD poppler-0.88.0-r1.ebuild 3393 BLAKE2B 3ab052ad53eaf884e6ae388010b8273c4e801b316490f040786dfd10cc115f420e00fba9a3e8449b89b8ac3f76c5e530601d9ca7f69eb4a57691407289dd9bbc SHA512 4dcd8052f9d6c4bc95c7670090e67de51b85329a91f39d266e9c92870b0931d91eb7c6f6d18039052416a1449b59cb7bded9b3b840db34d8a28b9d96ff234292
 EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
 EBUILD poppler-0.90.1.ebuild 3378 BLAKE2B f2cd5dbab1ffd5fff61dc9e4ffb9d93e5d840c4f814e9d0d40fba4c5f8ebc43c4b3c4394ae710f3c37464a45a2fa8f3d48cdbeaa1267b1814243bffdd91d2977 SHA512 30a280a51bc518ab6cc9697b650a5ccb1657d73f95c18382e957fcce94077d8446a33e26574c6a97dde5a346ee774b03c4c1cbd7c35dccd18b73a7228bc7d28a
 EBUILD poppler-20.08.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
+EBUILD poppler-20.09.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
 EBUILD poppler-9999.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
--- a/app-text/poppler/poppler-20.09.0.ebuild
+++ b/app-text/poppler/poppler-20.09.0.ebuild
@ -0,0 +1,124 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/102"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@ -1,5 +1,6 @@
 AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c7980fa0e5372db69465ccf964e7294213ae459e200a39f2721849df94a8433febcfb225813af3b43bc204b0edd3d64c SHA512 b8c4701f22c483078fb7d25df60c8f002f47573ec434a309b1a3739aecc1c51f79852b06f46c1ed9ae4cbec0e7d70aaabd06bc59e561c19d81b05388d3cedc61
+DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
-EBUILD eigen-3.3.7-r1.ebuild 2277 BLAKE2B 0dfe545dc1e223b91b48a57466af09105441a81f996abdbb9ea046ce4408423fae8ca58195f50d2816325084271fa7f23511a0982ea13aa6ae00d8dc7830076b SHA512 850afeb64f71531e5fb5595b4665d750f4b4933aadd1f08e08e6eeac3efa3f52373585f446d12a69f1dba203bb3732febfa89eeac03e440c6716fbd3c1f0c849
+EBUILD eigen-3.3.7-r1.ebuild 2254 BLAKE2B 6c995f2ae16a005a2992f34f2373db06690616175649f3f1750fcfb0f3875676a40a742f2504fe32ce127b1bb8090d44ec0983bab595d81af7d2edb05cd064a5 SHA512 03f623ff907403db989cb2941dedd0cda5534bed87b7c405383774d344e45695bec3011212b9d8a56c9752bf788a404ab2268b14ce854506dd206da9386b23f0
 EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
--- a/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7-r1.ebuild
@ -8,7 +8,7 @@ inherit cmake cuda fortran-2

 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/libeigen/eigen/-/archive/3.3.7/${P}.tar.bz2 -> ${P}-gitlab.tar.bz2"

 LICENSE="MPL-2.0"
 SLOT="3"
@ -50,8 +50,6 @@ DEPEND="
 # METIS-5
 # GOOGLEHASH

-S="${WORKDIR}/${PN}-${PN}-323c052e1731"
-
 PATCHES=( "${FILESDIR}"/${P}-gentoo-cmake.patch )

 src_prepare() {
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/openscenegraph-qt/Manifest
+++ b/dev-games/openscenegraph-qt/Manifest
@ -3,5 +3,5 @@ AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec6994
 DIST osgQt-3.5.5.tar.gz 1003973 BLAKE2B 4646fc0d01a5fc3023acb4be9d8b9e9982faf3849b9c7dbe775ff06642b9540559ef67189f31ebcf6a2fe49d24066d744ce9cfd409e76c9143ac16867648a620 SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498
 DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03
 EBUILD openscenegraph-qt-3.5.5.ebuild 970 BLAKE2B ad265f5b646fd029a3a40038fdf39262a93a3e7da58b44a09bc2a183327cd2f4e71e2c201dcb12891c141b25197616a4ff6b1f870acdc0673b76e144123ace04 SHA512 88d9a8a78277e6335dc8a064fb6f05e7f63c687cd1436c68bba56c03e9005bd42cfecdb418d87d9c82b35440d4cfcaec84c67178c02afeb8ce29b5937c3d411a
-EBUILD openscenegraph-qt-3.5.7.ebuild 1020 BLAKE2B 538bfd2f8970ac5294e95aaf955accb5c28183915044be546c58682c8c0101cd7243274d2375471296b3a53a839ab31d842fbd7bf8d893f972b5bf2c7263b8cd SHA512 a9a9a4aaf9bc253919051c049dc193ff0cf770073525f02694ff30145e47bbb4a16d5343ed1c1243ddfa811cd20b94845d2c543c8d34f74e7cb3696b7949fbe3
+EBUILD openscenegraph-qt-3.5.7.ebuild 1019 BLAKE2B 0287159f2698e4598331872367545f89090fa65d3470dd907ab2076b230167bafa0d2fbd716f0ab724550debc5fceef8a8e35001936936ee6e5c7e9e5525349a SHA512 9a2520187e86889d3217ec603764d6ff9dd61a84a0082e6e0cbfa27f762e8a7d3f52c6852a290e99c8e2555edb6bcf858124e0c683afce736b686d91f10ba0ec
 MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169
--- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
+++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/openscenegraph/${MY_PN}/archive/${PV}.tar.gz -> ${MY

 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="examples webkit"

 RDEPEND="
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@ -6,6 +6,6 @@ DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571
 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
 EBUILD openscenegraph-3.5.5.ebuild 3638 BLAKE2B 27b665585e57612457eff670f7e0d0dd90814701fb69853285d140bfc08ee9849dbc9754cb90e9397aeda63b8bf2b40f45a9d80e693484d27f815439e5d0e500 SHA512 bf13b1b1bef914464df6730f1ff2b702b30c986a54fa0d673aed6cabdae04139eb09ed57197d4f7facb2033fc9a3a7ac1a454c2fdff18274aacd29951b817c0a
-EBUILD openscenegraph-3.6.4.ebuild 4086 BLAKE2B 358547b9f17c9199013e4ca554ff46f6b740df15c6988f332113e808386ecbcf162f7a2ae06d5a8b82cfd1d88f4560894cdbd97ca42b8af0f8b1df3f53e8da30 SHA512 e514a59dfbc66715d4d30b9abb40cacc5e4c219d0834c0984380a738803031db53e04ee3394b28e97d60e02239dd1c6df5091782a9f4fc1d2a010e930733007f
+EBUILD openscenegraph-3.6.4.ebuild 4084 BLAKE2B 1cdcd148184400626cace2503ca2d0606584c35f945dd510fd5a3588dc14f002b15bb3bbad765af147a3d520ff25cbf6b858f043e4b9741043110c798aef1e3a SHA512 662490b464497b06b3b210327244c71b820dc20502ff1b7f32d0effe788de74d325935860f84a4f32f04de62cf24e2f241cacbe0da6e92f306050bb3e975135b
 EBUILD openscenegraph-3.6.5.ebuild 3999 BLAKE2B 164e857edb269a18453ce00da9d7c80ff8f4cf4c3daf765a10eaae2ed4f46bfdb3841a4fbbb10170139417a664b5aa1fcff5270889f6283a7e8e494a845da9ac SHA512 af11df69e1e7c948ddca05c59653534f99c7644887ce0c4340b83b69873e5e81a0fa0701496b38df30a3e65d6ddde052525b2f52f02cb6bc75e1d070f8a10dc7
 MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999
--- a/Show More
+++ b/Show More