gentoo resync : 13.06.2020

63 files changed, 893 insertions, 811 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 75f143b0516b..b9d1a2927d32 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index 15ae71e53c7d..b9c015898833 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -1,5 +1,5 @@
 DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e39546708e73631688d31c71c74af31e65cdb26bb046b6bf7f595409c0a71027c681fba1d4b3997020b1428 SHA512 e0772b8eecc1fb6f16c7516a6956825b9bda4149f00f56b34e68ec3544f74c2270ba8cc2642599de26ae34d11ed78b8bba70497bfc9a79f3008f50de02ce49d8
 DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
-EBUILD abduco-0.5.ebuild 850 BLAKE2B bc7ef19288730e9e4c867d8df3d95f8eee6c2d7efea37347c1ea33a24f2b952d9f53c15b03c978e00c56d3d8b2d78ccada1f72202f648436e6b7084fda6c9b48 SHA512 9635efe7b043c02b3fbeee37ae1b6f3c35cd95782d4dcd7d00e0550d95b49f283419eda86f94f58849b76b2b2ca082efaeb3bd1483901d74fb94f4931ae313a2
-EBUILD abduco-0.6.ebuild 840 BLAKE2B 5dff2465e0a29ddbfe5aa217b773cf84c26601c8eab4bfb4467a7af4df9a52a74ac38af89aacd8d8b005581db75c3773ceb5b0256db2488b8f949cc5eeaaf97f SHA512 ca7b46ee13e03afa73a60f8b301b91720fef4e6aefa457cbb4e42ad3ca897f8e6a587e133f974fac6b729c9a40f0673ab2ed6e788cf677d7970edc273217f336
+EBUILD abduco-0.5.ebuild 849 BLAKE2B c603251f7d29c92f882c7f8f98a1550b5abb02243c5c23da97fb865e40aa146bdf42621d5854e426952d1bcd832b47ae5d102d49186a49ed237ba1d227af48ef SHA512 3d34be8f90ab6f3016cb5431466821c5b122d1ca6f9989c9f19f95aef368092b9281c0bf3c5ce25a0cf97bc2f7c67ff676d45b3867d787f73b87ccbfc86b08c0
+EBUILD abduco-0.6.ebuild 839 BLAKE2B 0af65b0c9f0bd05b80511574bf67706a1eb6ddc33f35fd541d102847041d196356220a285c52ee8855aaa022388ce5d082f02bcf3d7a0fcc76e8fd0c18027611 SHA512 cdcdc9017752b118c7f38643048e3d73c28ceac9dd95c89a25530524fe3211c620af7e891fc0c3e07bb5481acf56b86313f8f4b302052ee69c285418106e84b1
 MISC metadata.xml 522 BLAKE2B 46bbeb1dd0a4ed305a71aad81f6cc505ab1994ed6f1f4d04f608523f1570cee1efc69394dd50c3e3e77409a90dfd29ecc5a60488a319074bb40a5ce7edcfa1bc SHA512 419afcca69423826de2226f6d577d610a1565d499e001531563e3f4c7952da0b5c8d7824a7d35359de153e68434de9c8326f9406d9833387423d66c7c111426c
diff --git a/app-misc/abduco/abduco-0.5.ebuild b/app-misc/abduco/abduco-0.5.ebuild
index 569c89575b42..6c804288e637 100644
--- a/app-misc/abduco/abduco-0.5.ebuild
+++ b/app-misc/abduco/abduco-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils savedconfig toolchain-funcs
 
 DESCRIPTION="lightweight session manager with {de,at}tach support"
-HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
-SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.brain-dump.org/projects/abduco/"
+SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/abduco/abduco-0.6.ebuild b/app-misc/abduco/abduco-0.6.ebuild
index 43df63cf6123..636f2f8dd807 100644
--- a/app-misc/abduco/abduco-0.6.ebuild
+++ b/app-misc/abduco/abduco-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="lightweight session manager with {de,at}tach support"
-HOMEPAGE="http://www.brain-dump.org/projects/abduco/"
-SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.brain-dump.org/projects/abduco/"
+SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index 25b36c216b4e..b373695a8dc3 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,6 +1,6 @@
 AUX abook-0.6.1-tinfo.patch 577 BLAKE2B fb012f1baf2ae0915e797c9f6d506d3c636370e5d112031ea163b076cfdbdd5d5eba080c210b552af426fdbc60c1841c9fefb2aa8779e1d829c3382f9231ba2d SHA512 0c7e657f67749e05aa2710e65ceadd8960a842f4029231298458446c9286945d0c6d89e837020a90e1f1ddc20ebee205469eb1355416d3d98e13fe9341007a99
 AUX abook-0.6.1-vformat.patch 497 BLAKE2B 7f3c57b05048be59f4037416a3df8c0e3a5ac3661e59c1f1f9afb86756de7852208b565aa40f5342f9bb4e4fb10efe4aaeca90ec4b6e5c1b38b487c8493053e6 SHA512 7073146a80bedcb7bc447d741028dcffd47ce60007b4b276438fb6437e19243f3a088b99ba9da96d2ac1b64b3d0f265613aa9d0426b5c03f57fd4c834544c247
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
-EBUILD abook-0.6.1-r2.ebuild 977 BLAKE2B d7ecc8166dec84b1eb448a5040d8505b400638f7304c65d86d12b53cf08ec7ca77a5af63cbd002a0c06e3f0f1a7a9de154cb4a813b87db5ffe6a78ae08e1a02f SHA512 7499e0d1e1dc3027ce849e727a623fe30dc98d611020e02cf85f76934e9dc79b93659fafa5dc60c0d7cefb02c2dd6d3012427d0eb3b5aba40e0b3ca2bff40448
+EBUILD abook-0.6.1-r2.ebuild 976 BLAKE2B 125703fe65276f7c87e10eb5cc998b6a97f884271d87e30281bdaad2aa7083610facbfc77bae81c2aead15c25a7ca6a89d4bd84f408d6d6f1c8d0f52ff8ca9a8 SHA512 766506ce7fe43a5bab40f6778f64cf0920789344598ff784b394e49f8525041c606f60f53e9e9e32accdea1cdb3640b5acb9ae8c3d4bf95f13c550c76184feab
 EBUILD abook-0.6.1.ebuild 959 BLAKE2B 16201ee33578c18ac8b91ac2dbcae233421142d371fb3091a45c8975213081f9a51c8ae09fc3d03c3bbd58c33e4d8d894811acc2d877dcfaae0b0417297f7fe1 SHA512 be92ae79aa58b4ccee582460406255f4a89d4c1a7b68d7006a2f3c4986310779f897c837b2adc066538a954fe201302c54586ca0c91700c2fa98cc611c33c1b4
 MISC metadata.xml 394 BLAKE2B 7bf50f13c562023ff4695feb92a21827004491743cb073e3e25dc6ce24b69556e8027c21b5f6a4c039032c7222fae4d0a7275940b170a689257203b12266ff26 SHA512 c10bb50afc5cce1b6067662d498b43a37a6718905ef47c6e0b5452d819c704972194516868ac667a35a3266f7d408d9ebc9a92076c53d8236075135c9f034334
diff --git a/app-misc/abook/abook-0.6.1-r2.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
index 77cc9716f4f2..deec4303f985 100644
--- a/app-misc/abook/abook-0.6.1-r2.ebuild
+++ b/app-misc/abook/abook-0.6.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index da657d025b74..e660b72da3ac 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,6 +1,9 @@
 AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
+AUX anki-2.1.15-mpv-args.patch 856 BLAKE2B 02c80c096ee3971cb781ea57ba8ebd63037c37668d57bef8d63f7c551544cd1eec04d134a835af5c918992172493a3b2933b6652e6872da2fe6bd6acb1bf6886 SHA512 ed44a965978dcb2ce85eab99adff59610c51614673415c7e34d1acdc77fa46e05c6b5eba6a4c3fda07ef5b3d3d5d1c9d844276377daff2189cbdf808168dd402
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
+DIST anki-2.1.15.tgz 4269571 BLAKE2B 00b351f5ffacb363642e02bf806bcd7c0d9446c9815a75328e7fa37c848b271b135510de17cc012e8cc96d8a52a183a49de84b6f85f562a370255bd36c6f866e SHA512 f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
 EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5
 EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150
+EBUILD anki-2.1.15.ebuild 2453 BLAKE2B cbe512d96f2c12ab05d4acc3b06036df3172f40ea3b12c1258168c85eea7ad897733f5ab3fa8e8d6bcc06faa334f95d1d2366f1cdaca17ef496a27fac80cd5d3 SHA512 caaefb97efba9c5fb7e0e142b23caba036fffcfd620383de14b42ae9094b768c657c1f4b2b2d4dddf7a72ec7b03254fd333c51e5a11282ddab13ec60ccb9d5e7
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.15.ebuild b/app-misc/anki/anki-2.1.15.ebuild
new file mode 100644
index 000000000000..2f651f60f1dc
--- /dev/null
+++ b/app-misc/anki/anki-2.1.15.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit desktop eutils python-single-r1 xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+SRC_URI="https://apps.ankiweb.net/downloads/archive/${P}-source.tgz -> ${P}.tgz"
+
+LICENSE="AGPL-3+ BSD MIT GPL-3+ CC-BY-SA-3.0 Apache-2.0 CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/jsonschema[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="test? (
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		dev-python/mock[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch
+	"${FILESDIR}"/${PN}-2.1.15-mpv-args.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
+}
+
+src_compile() {
+	:;
+}
+
+src_test() {
+	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}/usr/bin/nosetests\":" \
+		-i tools/tests.sh || die
+	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}/usr/bin/nosetests3\":" \
+		-i tools/tests.sh || die
+	sed -e "s:which nosetests3:which ${EROOT}/usr/bin/nosetests3:" \
+		-i tools/tests.sh || die
+	./tools/tests.sh || die
+}
+
+src_install() {
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README.md README.development
+	python_domodule aqt anki
+	python_newscript runanki anki
+
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
+
+	# not sure if this is correct, but
+	# site-packages/aqt/mediasrv.py wants the directory
+	insinto /usr/share/anki
+	doins -r web
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "LaTeX in cards" "app-text/texlive app-text/dvipng"
+	optfeature "Record sound" "dev-python/pyaudio media-sound/lame"
+	optfeature "Playback sound" media-video/mpv media-video/mplayer
+}
diff --git a/app-misc/anki/files/anki-2.1.15-mpv-args.patch b/app-misc/anki/files/anki-2.1.15-mpv-args.patch
new file mode 100644
index 000000000000..1e8cde1083f2
--- /dev/null
+++ b/app-misc/anki/files/anki-2.1.15-mpv-args.patch
@@ -0,0 +1,26 @@
+--- a/anki/mpv.py
++++ b/anki/mpv.py
+@@ -104,9 +104,9 @@ class MPVBase:
+         """
+         self.argv = [self.executable]
+         self.argv += self.default_argv
+-        self.argv += ["--input-ipc-server", self._sock_filename]
++        self.argv += ["--input-ipc-server="+self._sock_filename]
+         if self.window_id is not None:
+-            self.argv += ["--wid", str(self.window_id)]
++            self.argv += ["--wid="+str(self.window_id)]
+ 
+     def _start_process(self):
+         """Start the mpv process.
+diff --git a/anki/sound.py b/anki/sound.py
+index aa3431b1..a5fce446 100644
+--- a/anki/sound.py
++++ b/anki/sound.py
+@@ -124,7 +124,6 @@ class MpvManager(MPV):
+ def setMpvConfigBase(base):
+     mpvConfPath = os.path.join(base, "mpv.conf")
+     MpvManager.default_argv += [
+-        "--no-config",
+         "--include="+mpvConfPath,
+     ]
+ 
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index d803937b5e48..06a40e900ec8 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,8 +1,5 @@
-AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
-DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
-EBUILD binwalk-2.1.1.ebuild 1019 BLAKE2B fa9d822762dcabdda9ec271a7b040f546e6f85aada1ac743117a36236a513a0882e46c85fb0a79b5b1dae044ff4121ccfd07749d00ca0f93fcfc6cf935beecbc SHA512 62f213c19d46e87edc08f5e2814ca920751205e3c2a5f53ea47968e734ab9db7670ebeb2d390ec698c89112007f02831c32d0665fdaed59821751b098241f252
-EBUILD binwalk-2.2.0.ebuild 1057 BLAKE2B a84a9a5644597b76a8dc65eb59820a622fcb5dff0f7208d5478c8c929fa00cad33e66465d742817a6eeb01a7e5baf4fadbf59c82972bbc655d5c5a86c9daa6e5 SHA512 5b61d02913d0c83bf2b251d9c702975d81290129f3e948f4a994ca47049a6a15d8c31fa8bb552c180082430f40898fc15c77f1077ea8737a28078bfba6bb328b
+EBUILD binwalk-2.2.0.ebuild 1056 BLAKE2B 83b30456d4444816fe357d8997a3bdfb2f635515c0654f67bcaf7bc4d0308e436e23cde886b035cbb0a02d728b7bfa9201049d9336e1b80f5f2a73fbf949b397 SHA512 b031563d255a21e6eeef2d766495677e76bfe953c3303476b7ce635138189f08a627a36802e584ac1d096ad0ffa4066874ecf72c60213da2fe9ec5f0d205f5c3
 EBUILD binwalk-9999.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
-MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
+MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
deleted file mode 100644
index c69739d3e4da..000000000000
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="A tool for identifying files embedded inside firmware images"
-HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="graph"
-
-RDEPEND="
-	graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch )
-
-python_install_all() {
-	local DOCS=( API.md INSTALL.md README.md )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "binwalk has many optional dependencies to automatically"
-		elog "extract/decompress data, see INSTALL.md for more details."
-	fi
-}
diff --git a/app-misc/binwalk/binwalk-2.2.0.ebuild b/app-misc/binwalk/binwalk-2.2.0.ebuild
index cb74823a4db2..a235696e14ba 100644
--- a/app-misc/binwalk/binwalk-2.2.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86 ~x64-macos"
+	KEYWORDS="amd64 ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch b/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
deleted file mode 100644
index 708498060bc7..000000000000
--- a/app-misc/binwalk/files/0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 95bce4edcc6e92c9517b80ccb1fb956f591e0738 Mon Sep 17 00:00:00 2001
-From: Craig Heffner <heffnercj@gmail.com>
-Date: Tue, 5 Jan 2016 13:28:24 -0500
-Subject: [PATCH] Added check for backports.lzma when importing lzma module
-
----
- src/binwalk/modules/compression.py | 5 ++++-
- src/binwalk/plugins/lzmaextract.py | 6 +++++-
- src/binwalk/plugins/lzmavalid.py   | 5 ++++-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/binwalk/modules/compression.py b/src/binwalk/modules/compression.py
-index 97ca68d..e919f7e 100644
---- a/src/binwalk/modules/compression.py
-+++ b/src/binwalk/modules/compression.py
-@@ -2,11 +2,14 @@
- 
- import os
- import zlib
--import lzma
- import struct
- import binwalk.core.compat
- import binwalk.core.common
- from binwalk.core.module import Option, Kwarg, Module
-+try:
-+    import lzma
-+except ImportError:
-+    from backports import lzma
- 
- class LZMAHeader(object):
-     def __init__(self, **kwargs):
-diff --git a/src/binwalk/plugins/lzmaextract.py b/src/binwalk/plugins/lzmaextract.py
-index 137b4cc..93f6240 100755
---- a/src/binwalk/plugins/lzmaextract.py
-+++ b/src/binwalk/plugins/lzmaextract.py
-@@ -12,7 +12,11 @@ class LZMAExtractPlugin(binwalk.core.plugin.Plugin):
-             # lzma package in Python 2.0 decompress() does not handle multiple
-             # compressed streams, only first stream is extracted.
-             # backports.lzma package could be used to keep consistent behaviour.
--            import lzma
-+            try:
-+                import lzma
-+            except ImportError:
-+                from backports import lzma
-+
-             self.decompressor = lzma.decompress
- 
-             # If the extractor is enabled for the module we're currently loaded
-diff --git a/src/binwalk/plugins/lzmavalid.py b/src/binwalk/plugins/lzmavalid.py
-index a343656..62e15b9 100644
---- a/src/binwalk/plugins/lzmavalid.py
-+++ b/src/binwalk/plugins/lzmavalid.py
-@@ -17,7 +17,10 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
- 
-     def init(self):
-         try:
--            import lzma
-+            try:
-+                import lzma
-+            except ImportError:
-+                from backports import lzma
-             self.decompressor = lzma.decompress
-         except ImportError as e:
-             self.decompressor = None
--- 
-2.12.2
-
diff --git a/app-misc/binwalk/metadata.xml b/app-misc/binwalk/metadata.xml
index 12e5ca8a3e8a..6064ade4c2bd 100644
--- a/app-misc/binwalk/metadata.xml
+++ b/app-misc/binwalk/metadata.xml
@@ -18,7 +18,4 @@
 	<upstream>
 		<remote-id type="github">ReFirmLabs/binwalk</remote-id>
 	</upstream>
-	<use>
-		<flag name="graph">Enable support for generating entropy graphs</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index b1b17b39ecee..eca335aae05a 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,5 +1,5 @@
 DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
-EBUILD boxes-1.1.2-r1.ebuild 860 BLAKE2B 8f8cda39d4b621f438952903f76880a67eb4e48f6367ff9e2ef9fa539b2e1d3d6114e3fbf253ff6ab83d1bdac2561c974f7653bc9d6be09580189dfbd07991b9 SHA512 f2e2c43a74d568c48122bbfeef78bdb5f8030ae79c0f80fada245e1c23871ae6a3b3ef300020c07f885b3d759da1b832b544d49a2b30ebabe54840744c2261f2
-EBUILD boxes-1.1.2-r2.ebuild 869 BLAKE2B 5f3bd74b15f2d94d34001195d5c1856e98ad1056c51b25a82ab745fddaa7467ebd00aab5d39eb9719bb64ab3dc9b68cd74791e8f5593d6dc782123c648ab2817 SHA512 93ae9c4536ccae41faf5d0e7635a1071b44b97cebb82e243caa6661ba5ce2537f4bbc8e6617fb822c0545c661d0d99a05d4acfc72199a45adaf836e0afb1fc23
-EBUILD boxes-1.1.2-r3.ebuild 865 BLAKE2B de22a3d24051526bbf7d6b8cab6d900c37cddc769c40e63da62f5d45c77137aec3cf1d8f63fd4b3ba277e75da9b63ba020c16ddc80e7a73ad619ab4175948953 SHA512 81690b190e92686877552b49ad1e0d974b74b6e822cf6c101b4e5de85c7b256be6b00a4e3fbf6f04c09f0e3e328aeac4d941bdef33f78bdfaf935895103d554f
+EBUILD boxes-1.1.2-r1.ebuild 861 BLAKE2B 8bbae020d108173d6f2647ad71c8889ba8d027b39da246a85d9b20709eb65b78aace22ee8cde7e866b0e4abe6b939016bd2bce880c081f2305e96c42a2836b71 SHA512 95fd83afc6177d02a4a9f87470d1b92c6dbf68ab7017c5b2ed5c178c05844143d415e6aa688b53fcc77d96b605699c74dc0978f7bc2b1169e8e6a2dcb5d2e7c8
+EBUILD boxes-1.1.2-r2.ebuild 867 BLAKE2B cd8dc17ee0c7132043c903d39b6ddc0cd29e730b69a048ba530ad0a96e22d3ea06c6f4c6e439235e28868168b73ca5d40c39c6b468e56b8bf957a2150905a156 SHA512 269734ff1c748fb9322a541960c62a4c5a9945085e31927384bad4b57290ca4d9a5b1b26afe1c2f98152c4160fa084e822e38353840490f371528d6199b570bf
+EBUILD boxes-1.1.2-r3.ebuild 863 BLAKE2B cca9b6d5751095d09b6fcc5af8a0c3e59f2e3960b7e75a5c70593ccd8dae67860634f7a2d5766fd6013ef39efb49f3cc6d7b3c0e39bee69de9832d7695176a08 SHA512 84fe3f1561f764b0979b0ea95e1d914fd7e78f806e98a96bed01ef2e7febb48e8da8e0acb9ca0e30a1be1d31ca55056d82a07fd153b515817d07bcf1be634c12
 MISC metadata.xml 357 BLAKE2B ce56f6092cc7e6a1509a1be7627f92c543e64274915bdfaab74a03bb64c230b586c939a1fee654a1d81774076e35c9651e90b73d262330fae7b4320a31693af2 SHA512 37d5831d4633bd9f5d3d113841f6300adb8945827fd113bb9366181e11bd0234f7804f7bbb1b930e40a5a0a55e402b4561c8765d9d747100021c2e4ec5ba2074
diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild
index 49a128d9cef8..93e8b104e3ef 100644
--- a/app-misc/boxes/boxes-1.1.2-r1.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
 SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/boxes/boxes-1.1.2-r2.ebuild b/app-misc/boxes/boxes-1.1.2-r2.ebuild
index 78245bb48fea..e09f30d48d46 100644
--- a/app-misc/boxes/boxes-1.1.2-r2.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
 SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/boxes/boxes-1.1.2-r3.ebuild b/app-misc/boxes/boxes-1.1.2-r3.ebuild
index 737c507427ac..517e51b3f2d0 100644
--- a/app-misc/boxes/boxes-1.1.2-r3.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="http://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
 SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 91745b2847e0..5623f2a7d548 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,10 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
+DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
+DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20190110.3.43.ebuild 5773 BLAKE2B 927d1cbccb998ccb5286abf1b5bde99feffe8f31bc115f32cffc560a8e3c6d948a1290ccd094b2907a8db688ee74968c2947fec3e3aa83ebdd7d18a422d4f959 SHA512 89a403d3e7c90535c076dab313dc810c4b7031a423a43141333c71cfbce32be020b6a3c58ddc99b75f719da295233ea515f16edff57d2c5863cfe05265733278
+EBUILD ca-certificates-20190110.3.53.ebuild 5782 BLAKE2B 7902584ba0350809dae7d9754e55bd5b0b99fe6d85b6d660ad0a456e6f4c32f692e8d018a74b98db584d61deaf9f1d66731799762fa7196ad4b7c178d87e74d7 SHA512 d4dd05c0aca99f6ba8ba55af8c17ac3f39a0f5017adbf852e4606b7eacdee7a1010a1d0beaf46a2e1a1aa4cd98ce2918ca2791785ff7d72bf6c61aa08d74d07f
+EBUILD ca-certificates-20200601.3.53.ebuild 6034 BLAKE2B 6aebfc6277578170f29afe806179090332b8b8c73d9c7cbae4bce84df1b11b33aac6c77f26cd3916c6a61665a986433a5f54a333f53ee14490697d73fba5067a SHA512 a19d49d5b99c35a570952dab985dec6bd321eff099aeaaf176933d6096b896b25f493df29f0fbb3bf429bd6742d5ba0bd03698792669c66585f47c271540d70c
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
new file mode 100644
index 000000000000..0297708d122c
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.53.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
new file mode 100644
index 000000000000..42e6aad920a9
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED}; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/cargo-license/Manifest b/app-misc/cargo-license/Manifest
deleted file mode 100644
index 6d1efd549d27..000000000000
--- a/app-misc/cargo-license/Manifest
+++ /dev/null
@@ -1,50 +0,0 @@
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
-DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
-DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST cargo-license-0.3.0.crate 8049 BLAKE2B f417270d9b7f318457e0495d8261fd59414b4ea116b64f8b9267b62bf841732c1a5ee874519ae9d5ef756a75279b0880e915bc84ce48cc3807937221b91a3cf0 SHA512 73212ac4e0cc10eff8080a7294bfc3145eb96e7d2255340238a6b413ad0fbabad46ac7a3120835ee2f86818d8da6ca0744ceb7d6d1716ea59d9f315844342083
-DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
-DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
-DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
-DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
-DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
-DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
-DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
-DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
-DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
-DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
-DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
-DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cargo-license-0.3.0.ebuild 1303 BLAKE2B 4715a19c3fd78923e081e5d4e803d987b425b707ffcba62c13bf38c549c53edec797585212f14f2497382493edf2249a0df026fb85f61b461cc829c38103ae7b SHA512 1c6b119e39a9756513135defd65c1af3e8b538a60e8313b6b95b0fafd4a2438699e1170949148ac29a844a704c1fda78328fc9c304ec950998932cd69e1ebb27
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-misc/cargo-license/cargo-license-0.3.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
deleted file mode 100644
index 99618c8b0217..000000000000
--- a/app-misc/cargo-license/cargo-license-0.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.2.0
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-ansi_term-0.9.0
-atty-0.2.13
-backtrace-0.3.40
-backtrace-sys-0.1.32
-bitflags-1.2.1
-bstr-0.2.8
-byteorder-1.3.2
-cargo-license-0.3.0
-cargo_metadata-0.9.1
-cc-1.0.48
-cfg-if-0.1.10
-clap-2.33.0
-csv-1.1.1
-csv-core-0.1.6
-failure-0.1.6
-failure_derive-0.1.6
-getopts-0.2.21
-heck-0.3.1
-itoa-0.4.4
-lazy_static-1.4.0
-libc-0.2.66
-memchr-2.2.1
-proc-macro-error-0.2.6
-proc-macro2-1.0.6
-quote-1.0.2
-regex-automata-0.1.8
-rustc-demangle-0.1.16
-ryu-1.0.2
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.103
-serde_derive-1.0.103
-serde_json-1.0.44
-strsim-0.8.0
-structopt-0.3.5
-structopt-derive-0.3.5
-syn-1.0.11
-synstructure-0.12.3
-textwrap-0.11.0
-toml-0.4.10
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Cargo subcommand to see license of dependencies"
-HOMEPAGE="https://github.com/onur/cargo-license"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-QA_FLAGS_IGNORED="/usr/bin/cargo-license"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/app-misc/cargo-license/metadata.xml b/app-misc/cargo-license/metadata.xml
deleted file mode 100644
index c1744fe7fc5b..000000000000
--- a/app-misc/cargo-license/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-</pkgmetadata>
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index c77cacf7e61b..b8b21c4dcade 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -3,8 +3,8 @@ AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d81703
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.14-r1.ebuild 1499 BLAKE2B 49e023f5e5d59597de5214f0a374908349d733b6e4ed51d9eae3ef7b612fc9325696b3da822102c1e3155a77bd3ffd4ea9ae776443edba4038699c252b3cce17 SHA512 c904db8a5cf986a1bb3cf48708fe43bcd501d52487b0a410ffa16b1feddd4533c9dcf0e1d4b9b3baf118f662ae7f17b19e6d32b6b7bb1f9a8a1acb210085fc16
-EBUILD dvtm-0.15-r2.ebuild 1252 BLAKE2B b614650745ef0d502cf9c8ec66cb1e491f4b002ea40a12860353bf62fb1fa91dfadb7f276e527ccbe751229358ec376d3174ff84e6337519b3fe8598d17c0029 SHA512 7cb4060410bb7b4282477268637362e2c5337992941155621651972064d1021502e643184d769336eb465146dfb2a000d33ce43c632eb93b76223cc92a8ac4c8
-EBUILD dvtm-0.15-r3.ebuild 1247 BLAKE2B 8c04394660d30f532aebce68a1a23ccdaa5d0a89274d293785231aa24072506210d32477df448bcf578524fc6f8a60955cf76ce58beb4e39a092df38257fb9ab SHA512 192554add146d8214aaad50676369edf0cd860a0483c848cc50388c0edf5de1180a398df33278b588f20e5bb137b3ef7725c319355642c821a6dbe024d7de33f
-EBUILD dvtm-9999.ebuild 1251 BLAKE2B df136b7502f1845791061909b9cbc1d6c8c75867dac56b47ceda726430e69c85796c265cafddf9c853051243706fb49a9d299518556cd67d446822f4c8f0e638 SHA512 81903f29b1358bb1b9dc4d3fceee38ac1b05acc5cb46d4fe45a9be03ceea7a2a919649144c62f2d94eebbab9d11ef897c069df17ad38f7cbda0184277da06b26
+EBUILD dvtm-0.14-r1.ebuild 1498 BLAKE2B 6c302340c26178aac39dd6faef7071c2c325998470dacf015504c31fb1146151259b556742b2d70e60f1da4762654c8e281da70d7bb57ffcc2ad4a9b0b9dbefd SHA512 4b3df60690e4468269eb614d04166ab953159da9bcb807767c3afb4f153091e17cc6722f80d30c7028cdcd936748a7bde1fc6253c209c6fad2ff00079bd3b298
+EBUILD dvtm-0.15-r2.ebuild 1251 BLAKE2B ca2566bbfce7e9ece7adf4b02b02ebee3d381b23c02219970837f286f6e6d9c15c2dac78a6f51cfc39bc2454920e5fe19fc47aa623df7aeff3d53c9ba2489550 SHA512 0265a5d734176a3c23ea3cd609a13ba202bf4b199471c37ef9e652eb5a78cb58a1cb5d6367c9e66b18202519b826583160993fb202900da43a3fc0b32300815b
+EBUILD dvtm-0.15-r3.ebuild 1246 BLAKE2B 930eea360ee8e5a801e6f4ff3f890c57bffe069f70b22bbb746297ab1fb42e1da23a53642ecadb939c10abddbcc880ef47606767f91334a25ccc4f194fe5f38b SHA512 30122399a8a54a7b3fad309ad8f20f2c8ffd5252f0b5c7a4540b4c8ba7fdf23aa5336d7374b204855d40d82387610a95c5335f21694b5f5729a59697b57cb3fe
+EBUILD dvtm-9999.ebuild 1250 BLAKE2B d4d4479d93a67b41de5ac9b514e4241479a34ffe981e1a6264e36ea05ba8eaf3f788d314f3488dc089f0b046563294eaefbd4f9c5d9ee24a1412ff8ec43ffd58 SHA512 66a0ef9a78ab35d0f40ca41b6d1a1bd66beb4e1df54d3961905421ddd0f923a6accf2672fb2927b3cfb3062f006cad617ce0defd7bf3ebf78361b613b08e3b2e
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild
index 302a81e984be..c9a8065da403 100644
--- a/app-misc/dvtm/dvtm-0.14-r1.ebuild
+++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,13 +6,13 @@ EAPI=5
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild
index 6c0a09bddd82..46ead862d726 100644
--- a/app-misc/dvtm/dvtm-0.15-r2.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
index e31217f2b0b0..f83a6475a961 100644
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 8de03bafd8cd..44e2ba21eb3a 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
-	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index d35d119f2379..50723c398fa5 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,20 +1,18 @@
 AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd
-AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe3329a770c7e5a46e7a6898b9b7f6b0340a19af6e5536856620aa5981e3df0c0c1fa50dd57a204d752ce248 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
-AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30
 AUX elasticsearch.init.7 2158 BLAKE2B 934840e6013bca18282ceb6566bfe4fa9480a72a458bf1fc0566f4651e9e749ee9ff90f3bac2fd1cb75c5f7a3e91842a751af00b6245292600ad56060318a8ec SHA512 b847b089c18ec10892c395017a15f1f6e5af42055b11252219c832877f3f5d6c78988af85eeaf671fdfd9a7155ce19ea8e16f70bfe86c4453ea0174908eec520
-AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e SHA512 cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
 DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e SHA512 c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
+DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
 DIST elasticsearch-oss-6.8.8.tar.gz 68655829 BLAKE2B 808b9dd49f7d9c9968e6e1c5dcd8d1150d3638b8380ad0608f1e85f00d98c6da6d0c9c324f244b510d35ecec0f37b40e29fd0761b83118e137cf394c231cc0e8 SHA512 7c5972d365a8a2a80c351039ff54a274bb1f95379d6f4feab4fa01360541bffa58409ffac6030acade24be54d1cc57e7ea24a7cf29531aba35a565718e30288d
 DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
-EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
+DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 EBUILD elasticsearch-6.8.8.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.7.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
deleted file mode 100644
index 0fa64b4d2693..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.7.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.2 b/app-misc/elasticsearch/files/elasticsearch.conf.2
deleted file mode 100644
index e802448a86ad..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf.2
+++ /dev/null
@@ -1,59 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch home directory
-#ES_HOME=/usr/share/elasticsearch
-
-# Elasticsearch Java path
-#JAVA_HOME=
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-################################
-# Elasticsearch service
-################################
-
-# When executing the init script, this user will be used to run the elasticsearch service.
-# The default value is 'elasticsearch' and is declared in the init.d file.
-# Note that this setting is only used by the init script. If changed, make sure that
-# the configured user can read and write into the data, work, plugins and log directories.
-# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
-#ES_USER=elasticsearch
-#ES_GROUP=elasticsearch
-
-# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
-#ES_STARTUP_SLEEP_TIME=5
-
-################################
-# System properties
-################################
-
-# Specifies the maximum file descriptor number that can be opened by this process
-# When using Systemd, this setting is ignored and the LimitNOFILE defined in
-# /usr/lib/systemd/system/elasticsearch.service takes precedence
-MAX_OPEN_FILES=65536
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml.
-# When using Systemd, the LimitMEMLOCK property must be set
-# in /usr/lib/systemd/system/elasticsearch.service
-MAX_LOCKED_MEMORY=unlimited
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-# When using Systemd, this setting is ignored and the 'vm.max_map_count'
-# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
-#MAX_MAP_COUNT=262144
-
-rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES"
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.2 b/app-misc/elasticsearch/files/elasticsearch.init.2
deleted file mode 100644
index 6e572c58da25..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.2
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-
-pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
-
-command="/usr/share/elasticsearch/bin/elasticsearch"
-command_args="--daemonize --pidfile=${pidfile} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-command_user="${ES_USER}:${ES_GROUP}"
-required_files="${CONF_DIR}/elasticsearch.yml"
-retry="TERM/30/KILL/30"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-	fi
-
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service b/app-misc/elasticsearch/files/elasticsearch.service
deleted file mode 100644
index 927acef5ee88..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.service
+++ /dev/null
@@ -1,53 +0,0 @@
-[Unit]
-Description=Elasticsearch
-Documentation=http://www.elastic.co
-Wants=network.target
-After=network.target
-
-[Service]
-Environment=ES_HOME=/usr/share/elasticsearch
-Environment=CONF_DIR=/etc/elasticsearch
-Environment=DATA_DIR=/var/lib/elasticsearch
-Environment=LOG_DIR=/var/log/elasticsearch
-Environment=PID_DIR=/run/elasticsearch
-EnvironmentFile=-/etc/conf.d/elasticsearch
-
-WorkingDirectory=/usr/share/elasticsearch
-
-User=elasticsearch
-Group=elasticsearch
-
-ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
-
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
-                                                -p ${PID_DIR}/elasticsearch.pid \
-                                                -Edefault.path.home=${ES_HOME} \
-                                                -Edefault.path.logs=${LOG_DIR} \
-                                                -Edefault.path.data=${DATA_DIR} \
-                                                -Edefault.path.conf=${CONF_DIR}
-
-StandardOutput=journal
-StandardError=inherit
-
-# Specifies the maximum file descriptor number that can be opened by this process
-LimitNOFILE=65536
-
-# Specifies the maximum number of bytes of memory that may be locked into RAM
-# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
-#LimitMEMLOCK=infinity
-
-# Disable timeout logic and wait until process is stopped
-TimeoutStopSec=0
-
-# SIGTERM signal is used to stop the Java process
-KillSignal=SIGTERM
-
-# Java process is never killed
-SendSIGKILL=no
-
-# When a JVM receives a SIGTERM signal it exits with code 143
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 225396720633..c0cc80a85ca3 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,5 @@
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
+DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
 EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
+EBUILD gnote-3.36.1.ebuild 1548 BLAKE2B 6edd95f88dc91cb497d0c381d70ff6372ecdbfb576fea1b52225ccefe7e6ef1eecf1ff35fa2131c1778679c119a82121488f3f9777e8a01176324ffc4e9c01a5 SHA512 9a3d035a3eec9d4b03f3209cde5d15eb0ba39c882213999972eac931301d5a64f053c3927d79d293461047ad8ba6c4b5a7eff1665aa546c4ff3a847caaca76ab
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
new file mode 100644
index 000000000000..95d5527ca525
--- /dev/null
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# Automagic:
+# glib-2.32 dep
+# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
+COMMON_DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gspell-1.6.0:=
+	>=dev-cpp/glibmm-2.62.0:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.20:3
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 5037f03e986b..561febe04f82 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,5 +1,5 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
 EBUILD hivex-1.3.14.ebuild 1849 BLAKE2B 0c138e91aba7d4bdd04680d34330123cba162564f1ccc70d8310d77de7ab87940bd3bc87f65a84a2585a194cafc821538a9674c2ec32eb45f001c7895c26d432 SHA512 0c25e80c4a57e7fdaec743ab7696149f68541468569d2f46353dc2c16e9441270108ebd5238b38cb96d25f1d74eda56b3afb0d9636200edd730b6df5f8a5d97a
-EBUILD hivex-1.3.18.ebuild 2012 BLAKE2B 038e286f3ce9631f370fa824fe4f7958e902490380449b175d799ad1a8d24f281cc623d7e73ffc3c410c53c8480d757646dba328913d5438cfd1bc9b4887523b SHA512 a946f24ee6534ed8033b6039954c32ed1c6b419e9f1db0e837bb90a9097219fc3f795541302fd9dca52aaaf863cf5308a34d660ade7ea24ed8e308abaae01c47
+EBUILD hivex-1.3.18.ebuild 1902 BLAKE2B 9244029dc8a020e4695e6563a2dd3cbc8b4516a7aa944b5ccfffecf7be27218e49392e775c13952942c094696852352cc8f45ba01e67ca76e0e2a526d74ced59 SHA512 0acfbfb2dd9682889cb2c2ba5cacac50f442bf6497bf8d87cc94fabc5c9b2702a4473aa10ada47607d334a47d748b3b7db76b8d0dea7e7331a50efbe29099fb4
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
index d50454845f25..dad58992eb7d 100644
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -96,15 +96,13 @@ src_install() {
 	strip-linguas -i po
 
 	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-	python_optimize
+	if use python; then
+		python_optimize
+	fi
 
 	ruby-ng_src_install
 
 	if use perl; then
 		perl_delete_localpod
 	fi
-
-	#can't figure out a better way to do this
-	mv "${ED}"/usr/man/man3/* "${ED}/usr/share/man/man3/" || die
-	rm -r "${ED}/usr/man" || die
 }
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
index b72f8e80521f..ffc31a792ce1 100644
--- a/app-misc/i2bits/Manifest
+++ b/app-misc/i2bits/Manifest
@@ -1,3 +1,3 @@
 DIST i2bits-0.1.0.tar.gz 2649 BLAKE2B 050e7eddadc4e8b4e1da50128b735adbe6fbace35a06709fd2f31db3e8ffb672b3d51eced0ecb9c87c3566d32c9aac7a431c641e53597ee55ae431328dfbee48 SHA512 9f7b2fe8ca66740cae081c3f74f0c5d67d956c8cd2b5f39cb7306e58a8f75d6d5848dd640e7e514638dda6f3d1efe5f292605dc4fddffe5e530bbd5f173a1db9
-EBUILD i2bits-0.1.0.ebuild 338 BLAKE2B 443017c5d2a904e5478d4f73519699f8ed86498d96c7fa4919f8d7c16cffa92dfe703cdb9516ac51cc52c7b26d74c37cfc5cc81b01f25e611b4736f7b46e03e2 SHA512 02c2078fabcb663810d7a533ed1bc0295c4b63cfb5032d920852bc653d5a05a9bdf5d6a9cdf8ad0d8aa78d78dcf4ee7f75fea27e93fa43f106061183c8ea46c4
+EBUILD i2bits-0.1.0.ebuild 556 BLAKE2B fcbe0849f8519097023a46ec0fcf87b59d00039d71cb9a387536b612cdce7fa82fb1a9131ea3ae0bc7ca33409d3922ca5715c11da2c9c350190f105acd5a31bb SHA512 ccb63ffe81523a3959c99d01461c26afb881aafc9d173f2f61b42d8d88a994288c8f6db0de1d4feb46fe6794148db9a16f5e12bd054d19b071e6386ff663c27c
 MISC metadata.xml 334 BLAKE2B 02924a4da850188a7552708c5e13c82b3d8912197d09b8a83678960c3de0e408e9dcd458d8dc18a8ae829e33c1c9b9a7754f6b2a6f8a7bce85b35a3ddbebc1eb SHA512 62b95a5794d247168cf9351ac0d70e9d910416241897ceb6b8203eeaaec82cd0c462333b7559f1cf68a7edbb9660af8892cfa50e6368f24f18a0200d78458e74
diff --git a/app-misc/i2bits/i2bits-0.1.0.ebuild b/app-misc/i2bits/i2bits-0.1.0.ebuild
index 4bb902c770b3..e877529fb905 100644
--- a/app-misc/i2bits/i2bits-0.1.0.ebuild
+++ b/app-misc/i2bits/i2bits-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Utility to convert hex or dec to binary format"
 HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
@@ -12,3 +12,11 @@ SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
+
+src_prepare() {
+	sed -e "s/^set(CMAKE_C_FLAGS.*/set(CMAKE_C_FLAGS \"${CFLAGS}\")/" \
+		-e "1s/^/project(${PN})\n/" \
+		-i CMakeLists.txt || die "can't patch CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index def471e381a5..04f830602809 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,3 +1,6 @@
+AUX icdiff-1.9.5-tests.patch 761 BLAKE2B a1e837489ea14ea0a2ee88dd23294bf9dc6368fa052b5bf888ca1a37401903717792651833e751a8711c8b865ce4a038615ad4c23f91586af6b46511d28dfb52 SHA512 c1587ce221b7c1e9191b429c1b16c84bdc698e889e5f3c0ce722442adcdb836f2b7f38c193163ba5bc210ef31da4a3e3afd90ae44d3ad285ebe563993125f8cb
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
+DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86 SHA512 f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
 EBUILD icdiff-1.9.1.ebuild 536 BLAKE2B d60063eca3c2d812a417176816040fd62b123aed33b5eb2516fa92ded176ccbf36ec19ee332afa071120cc864b5a18a4185b8619f8ed0d93360091c4f19506b3 SHA512 c9bc8e2fde7174cd30c30bd9ef64bc3f6a05f5b3011e7de401b2286743624fdc1f8c29992c7e75d52bef42b7653e63b808bb2afd14ce092e4af2f40a49d5b4dd
+EBUILD icdiff-1.9.5.ebuild 649 BLAKE2B f65c043228d2794185fdf83755067c9e775883ffcad4f966736ea5b32e2512c8a8b2474dc2eb57d1c8705299d7511d16d86b827fba6b00e654b6bbd43ac86ee8 SHA512 481e0674ecf0734c133c8fc94b48845ecc5ba7ff37d626bb427549492786fd6a9c65694a0fa29ab113ee47fb089f3eaf260b6003b9ec104551bbc71f96d25b44
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/files/icdiff-1.9.5-tests.patch b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
new file mode 100644
index 000000000000..3e2467460d2c
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
@@ -0,0 +1,29 @@
+diff --git a/test.sh b/test.sh
+index fd1679e..5b756f3 100755
+--- a/test.sh
++++ b/test.sh
+@@ -86,6 +86,8 @@ function check_git_diff() {
+   local gitdiff=tests/$1
+   shift
+ 
++  # does not work with newer versions of git
++  if false; then
+   echo "    check_gitdiff $gitdiff matches git icdiff $@"
+   # Check when using icdiff in git
+   if $FIRST_TIME_CHECK_GIT_DIFF; then
+@@ -96,13 +98,14 @@ function check_git_diff() {
+     export PATH=$PATH:"$(pwd)"
+   fi
+   local tmp=/tmp/git-icdiff.output
+-  git icdiff $1 $2 &> $tmp
++  git icdiff --no-index $1 $2 &> $tmp
+   if ! diff $tmp $gitdiff; then
+     echo "Got: ($tmp)"
+     cat $tmp
+     echo "Expected: ($gitdiff)"
+     fail
+   fi
++  fi
+ }
+ 
+ check_gold gold-recursive.txt       --recursive tests/{a,b} --cols=80
diff --git a/app-misc/icdiff/icdiff-1.9.5.ebuild b/app-misc/icdiff/icdiff-1.9.5.ebuild
new file mode 100644
index 000000000000..1b4fa11ae9d1
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/icdiff-1.9.5-tests.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+python_test() {
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 9eff0852328a..9fbabcc70b63 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,6 +8,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
-EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
+EBUILD lirc-0.10.1-r3.ebuild 3850 BLAKE2B 901ee4538227ee8fea67cd7f3368d2d1bd1d4d675a08389876f1e5592a66066ad48c81084e3309e1115c69dc9eb07ae5b3f31a766ab6ee421014a72820fe063a SHA512 0b5e2140748d35febd8271ed0edd17fe9b207349f961a6f0ffaebb28d3bc8e5354ffd1306303d68ed8e2fbfc877482586e82e76f47e7e82f83261057afda8646
+EBUILD lirc-0.10.1-r4.ebuild 3897 BLAKE2B d07c46d8720ffac34b0fb886f2b63cac81cf7aca425aada49a4151a30c617f4ae8f18d4d9e6c61690910079edc626d877eb556a9110fae7b032033b63d3231bb SHA512 86405d22b09629e9a564860f1fd215a9efbe600d94f338e57c66fbafab94ea4e81ecb9589bc3658fdfa917e1c3eb69a349430949de9dc1a0d5915276643828b9
 MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
diff --git a/app-misc/lirc/lirc-0.10.1-r3.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
index 368f73717811..25782aaa0924 100644
--- a/app-misc/lirc/lirc-0.10.1-r3.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
+HOMEPAGE="https://www.lirc.org/"
 
 LIRC_DRIVER_DEVICE="/dev/lirc0"
 
@@ -17,7 +17,7 @@ MY_P=${PN}-${PV/_/-}
 if [[ "${PV/_pre/}" = "${PV}" ]]; then
 	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
 else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="https://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index 52fbdf73aa50..9d7322574f9d 100644
--- a/app-misc/lirc/lirc-0.10.1-r4.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
+HOMEPAGE="https://www.lirc.org/"
 
 LIRC_DRIVER_DEVICE="/dev/lirc0"
 
@@ -17,7 +17,7 @@ MY_P=${PN}-${PV/_/-}
 if [[ "${PV/_pre/}" = "${PV}" ]]; then
 	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
 else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+	SRC_URI="https://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 5bb14c139d8a..7fd11dd72a03 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
 DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
 EBUILD pax-utils-1.2.5.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
-EBUILD pax-utils-1.2.6.ebuild 1762 BLAKE2B 78669c85c432ec6a9f727eaedcbad20b669e48528a6e809bb79adeed14c7ce2c96421db9bc56d425ea33a27bba2876d6b5effd52e03d82f9ae06ed1b51e21b1a SHA512 a40960331107886c8d5711067f59b79faf74e9bb0e63978579091d6871b7f5a6bc6ce321c6003fb2806e1c118956d3642e975e4ecdbbc1a1f14629a400cbdca9
+EBUILD pax-utils-1.2.6.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index 0e0286ecb1bc..00767ccb7d09 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 1a8e9bf47d33..368b6406c8f7 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -43,5 +43,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180606202747-9527bec2660b.zip 1264148
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.0.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.0.0.zip 310156 BLAKE2B 1c3465601193c1d59640a7f329853a0414318fd7c5278cb6b351815cb6161867b3e6ec353160700812f7cdd6aa437d2027de31bcfa7314fe77db39263947dc98 SHA512 72ad399ab4badfe9d180c742b39ab528f515b76931baebab25b83cd39338585ce8aebb0b53582319f2ed49156b12e733116533946127456116997b2340674d6e
 DIST pet-0.3.6.tar.gz 2739396 BLAKE2B 16fd9cd2e80d742b7f56819318f709ebe40902e9096c4b5f11b4dfb5341c78b491e70b1d5e6ff81d758413b9b2276e9bd87e99eb320592a70f93a2c75c805892 SHA512 366eabd93865ac72f9d251d51393ba9ad5904195d40f26da80a371d6d2183b5e81156930b137b1551ef2bd372cbf235847dd8a7ac8c7d4584c9d326325d30f79
+EBUILD pet-0.3.6-r1.ebuild 3090 BLAKE2B e94be83612c2aaa16fa07b73c87494125ae94bca15b1de10355990b2e64883ecc5791b1b625c2c98e5ee9e063c5e24736afaf3f0debdec9940d60f58c4405cef SHA512 8779018dcf52dfceeaa4987efd41f39dd332b240443bf7d4222043aa4019f9f1e898a460dec180c985d0a6bc32f22c60c285e537e47688e97cd29c54328d908a
 EBUILD pet-0.3.6.ebuild 2939 BLAKE2B b864a4138f8bc468eed85b9c4988052b984f178c1d689fee4616b35bcd71801c41749257d6a886687b5b0233b1690f5bd9e606d96cee6e94702bf469c7908a84 SHA512 bb03376315f4350b313d02f2697594b2b654a936a64f5853821aeffeae6ccb7b90f98a96863081726eed666c9981e9f476d1e1db3bec4c6be9436f895cd981b8
 MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/pet-0.3.6-r1.ebuild b/app-misc/pet/pet-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..09f5ee655f7c
--- /dev/null
+++ b/app-misc/pet/pet-0.3.6-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.0"
+	"github.com/BurntSushi/toml v0.3.0/go.mod"
+	"github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5"
+	"github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/golang/protobuf v1.1.0"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/google/go-github v15.0.0+incompatible"
+	"github.com/google/go-github v15.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135"
+	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jroimartin/gocui v0.4.0"
+	"github.com/jroimartin/gocui v0.4.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/nsf/termbox-go v0.0.0-20180509163535-21a4d435a862"
+	"github.com/nsf/termbox-go v0.0.0-20180509163535-21a4d435a862/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.1"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/xanzy/go-gitlab v0.10.5"
+	"github.com/xanzy/go-gitlab v0.10.5/go.mod"
+	"golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4"
+	"golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a"
+	"golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20180606202747-9527bec2660b"
+	"golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod"
+	"google.golang.org/appengine v1.0.0"
+	"google.golang.org/appengine v1.0.0/go.mod"
+	)
+go-module_set_globals
+
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+SRC_URI="https://github.com/knqyf263/pet/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	go build || die "build failed"
+}
+
+src_test() {
+	go test -work || die "test failed"
+}
+
+src_install() {
+	dobin pet
+	insinto /usr/share/zsh/site-functions
+	doins misc/completions/zsh/_pet
+}
+
+pkg_postinst() {
+	go-module_pkg_postinst
+
+	if ! has_version app-shells/peco && ! has_version app-shells/fzf ; then
+		einfo "You should consider to install app-shells/peco or"
+		einfo "app-shells/fzf to be able to use selector command"
+	fi
+}
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 0d81c1b010e0..9912fbfda9d6 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 872 BLAKE2B 1b80b0ae1b9114dfcfb5af2a7c5792eca44a7bd40d6a11b0749cad8437d2611df10dc47286dcc1fe173569f74e379dda5ab700aa80a98d51edb6780877b59f3b SHA512 8e8a5ee1c02680f322daab204eb4bfb6e56693909cc334a9f2ad37b2a28c6feaea0955fc80f32b000f030845daf5d777bc0bfe340bc091c6562229f747412fa2
+EBUILD sl-5.02.ebuild 950 BLAKE2B eac96277aa2b4629c5aae03616baeb754a047ddb8b599657884556dfb4fcb9560c17397823d27329c48c749639e601750b0333f60d5e10a43bc9882e4f7c27c8 SHA512 eb6d6489cfaa6678969805372eec3e987de7caf0a15601cacc2c51c6ed3df3c2e0c263bf76fbf26b43740401465beebb749ca6ecd28482a80beb8d15b6d5de71
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 5601461b6792..84dd9b3cc221 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -22,10 +22,14 @@ DOCS=( README.md )
 src_prepare() {
 	default
 	sed \
-	    -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+		-e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
 		-i Makefile || die
 }
 
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	dobin "${PN}"
 	doman "${PN}.1"
diff --git a/app-misc/spire/Manifest b/app-misc/spire/Manifest
index 751326f589a2..b145ad527c01 100644
--- a/app-misc/spire/Manifest
+++ b/app-misc/spire/Manifest
@@ -476,6 +476,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa2
 DIST spire-0.10.0.tar.gz 1314075 BLAKE2B 8ac6a8186b231441de474556b2f03cd5ec0c412d331c0248e87f322773ec8a0225c452d994d65456faef25a56346b6ee87e3234f53e62542a67766b96a47f7ec SHA512 3ea4e9d7d65aff6df93301c1d82720db8697c300793630340826221df19f54a8f8a5a40bef4af90aad372d3a17b6c90bc99cc442cc53a820955029e008c37854
 DIST spire-0.8.1-vendor.tar.gz 10550551 BLAKE2B 4ab04c0e4de231097620a015f523ed9d7e0d6872425826e4bc3572f920a4d3de5174cb78f4ed61340ffc1abe3e25d42e8735228b142b424c85ef24fac52740ca SHA512 879cba4eaa681814858fa7965b28d0217d4ae806c979d348cb6d5f413dca7f03f99c34b8dcdbc0dad8e5253990a473962b9c1438ba79bef5fe757df11c7f4ee7
 DIST spire-0.8.1.tar.gz 1070262 BLAKE2B 7e30ac233759f2fed7476a82d072c4ec7815346cb50419b10ac7c5ce566aae6e783a51284a39847d63c04b0e398aab7ad15d94ea4e05569b43e762abfadaf550 SHA512 aa864f3f1d0faa8b7bfa527effde244957f9b30c6f115e49819777b6f3a5ea751ed751ac19b94a45d02aa22e719e6bd6e33355f9b561bbc5458d5997d95a1437
-EBUILD spire-0.10.0.ebuild 25659 BLAKE2B ee3a14490cd8209715edd593afa86bf82de1848e8afdaa8474592ff207ce92db1e529110ccc24d754ea3d47d5ff58f3e053161b25911ee5b06b71060c9778715 SHA512 56fbed6c3f401abc5b87f44f2792500f8e664fbaef04eeb7f236fb3cc01ff28934af678ed4fb6ba99dea46a758100c176300072e33db8803e0a6daafdf2d4fea
+EBUILD spire-0.10.0.ebuild 25731 BLAKE2B 7ca8d311a8135327e1077add2a72b5566b84d5bee23adc860cdfcb64af48e0d83dcfd8f5303fa6d0e092d28cfa907d531607b9fa6f84f97e4421c578fcae8de0 SHA512 e903bc42f0b647b0bc7515119ed9e425ac5b72a04b98353f489f235f024b75403088c3d34231087b18bc844442adb293dbf8463ea79e2024a1f1bc3fec032b9d
 EBUILD spire-0.8.1.ebuild 1521 BLAKE2B 7775177fcf811810fd8682b482697e20f9f5dad8fdd18a44472606de6ed3084829d162963570d96d3a45a68156c17697d078b3549d7aee60f02d00b6ffa10d8d SHA512 a963544fbd3d0ad0a21c3c7c3c9e1781e7486baa406a5c9f828a79db7b7230cd16552dd8dfaef34728a77ac455184275b5f2180bf56865c5e59c9a4f8e39f179
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/spire/spire-0.10.0.ebuild b/app-misc/spire/spire-0.10.0.ebuild
index 1e4f516c7b82..c55c76dc083a 100644
--- a/app-misc/spire/spire-0.10.0.ebuild
+++ b/app-misc/spire/spire-0.10.0.ebuild
@@ -493,11 +493,17 @@ COMMON_DEPEND="acct-group/spire
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+RESTRICT+=" test"
+
 src_compile() {
 	go build -o spire-agent ./cmd/spire-agent || die
 	go build -o spire-server ./cmd/spire-server || die
 }
 
+src_test() {
+	go test ./... || die "tests failed"
+}
+
 src_install() {
 	exeinto /opt/spire
 	doexe spire-agent spire-server
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index fcde9252b5ee..80f727d22349 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,5 +1,3 @@
-DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
-EBUILD tracker-miners-2.2.2.ebuild 4625 BLAKE2B daad0bc3a51a3f828211e44c0db1e397155e393c2bab325e203f71d0d40ce9c479d57937a6b6c6ba7d0a82b0a4933697e7b78fbdafd12db3cb7f7cf8701e192b SHA512 5a769a794539098e6b38bd52431d7f3d6c773b305e0acaa8ef33cdd41ca46b1a7c0a8af630162345a27c77b7b0a2c14b5e04dd713ab881304db8e3d1085987c6
-EBUILD tracker-miners-2.3.3.ebuild 4614 BLAKE2B c3f73ec3802c52ee319ec2a6a712c6563dc24c06110edd5aaea27d536b3d24625588848286bdfc4b7a2692fd7939a1291fcf1901cf402a38fd25c1a598acfb4d SHA512 720743618616733a731b2b5937f8ff7bf4e49cab6f22c7a86fb90a74f24d25ba9f40f734de0cdb315f404d35c6bbf403e325c973805a5b8710261aa9a487bcbe
+EBUILD tracker-miners-2.3.3.ebuild 4613 BLAKE2B 6f1f12bcf4af210b4c48ede6dd31a3de6748e2dd8882c507edea4e0e3e25952be7ee13dcd142eab1f37b4d2aa02fff3d01ce9a0a9a0febc710beff12a7b93c3a SHA512 9222b7a115e3a02f49d8b1296f3a78aaa5bffb96d1fce26b1e6d8a342afb6a29f440bd6df099d2871a6b3aae6470cab1adca3befffb32648f762d1e4404c3806
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
deleted file mode 100644
index 571b909db24d..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +taglib +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	taglib? ( >=media-libs/taglib-1.6 )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
-			media-plugins/gst-plugins-openh264:1.0 ) ) )
-"
-# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature cue)
-		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature taglib)
-		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
index 55256eea7a2c..580229daebd9 100644
--- a/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index e02e742cb4d5..ff1399807173 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,3 @@
-DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
 DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
-EBUILD tracker-2.2.2.ebuild 2590 BLAKE2B a50bac85eb9d02d14428ccc3a2f596a95c180c980ade8c51b1aae5669db2c19810bbdf080a2a02e8ed35bbeb24d847740de58595f10eda5c8874ebf3e90cf9a2 SHA512 5d4ff9bd28033bc3f7070a884516cfa0eadb984398513eae597d227d75222e18bb68e8248caadf5ec1ac7743bc18678a6df80c777f364e7cda918b1b4279cdea
-EBUILD tracker-2.3.4.ebuild 2593 BLAKE2B fe6f7e43678ae5e7e08cdfc418c4b93bec966f875e07dc498f8c202eb09824ea336d8135f1188f78019cbc089acf0533e5f05dfb64bf8aa84240bbd6c79e2ac7 SHA512 7b87843b7b980a3d5f4424d03c0198d17b57dbac7c0482640f044f3786f94064f16f8d01aa5093cec46da7d638760367dac3e4c955092d8308b2e7cd58f487b4
+EBUILD tracker-2.3.4.ebuild 2592 BLAKE2B 2a5c66824cf6405495f2facaf0d8c30eeee6b2d7993fc5ccaf69949fb9c5ff0a4070587932d52a94303707cd7d3d6ceb04196c1bc536a9f510f74204a408159e SHA512 8c23b0ad1c7b7aca2399a6fd84a25d6f03bf507e45253042c5e0958321cd876af3c8359d5f7dc48cc7503b39b31c867a6a182a5d9aba9e262318eac177e4b744
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
deleted file mode 100644
index eed86681854f..000000000000
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0"
-IUSE="gtk-doc +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.0
-	>=net-libs/libsoup-2.40.1:2.4
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.20.0
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	$(vala_depend)
-	gtk-doc? ( >=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dfts=true
-		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
-		#$(meson_use test functional_tests)
-		-Dman=true
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion="$(get_bashcompdir)"
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index 49070be66e48..cb4efce3cb78 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 #RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 7fc8bddc551a..17ec603b82da 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,3 @@
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3.ebuild 712 BLAKE2B df20be59eae2251acad8beebeed734804d524a379684a93ad3fe04ae922bf6b79ffc4736b23f4830a5ae33b11b553a65915e4f15556afe1e7f045fa9b39d8020 SHA512 9f1d6f671d9ea250c8817fddec5a18c2270985046cc0f6fddc34b70897c654900cb33b96c5cf7ec7fa75b5bc79a5e4cd372e8babb7c63faca3f34c1e28be7978
+EBUILD ttyload-0.5.3.ebuild 802 BLAKE2B 4a29f5d4d29d6d4f720dd8fa6362a52cc01c49a49bb4b5d7dec9baff453adbfb62827898fb0c13fc7897d3d9c290e2a2dd5a25b4011b2328f22481ed4c9fe64d SHA512 53be4bbef175cae500e6c8d5480f3cc1d5e8e3c399a7997397911f7caa683701f98f64d7f0f11db097b8a67cff6785076da949a7389e71c5d31e50c846a26693
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
index 09ffb3b75712..a3d6358a8315 100644
--- a/app-misc/ttyload/ttyload-0.5.3.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.3.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=6
@@ -22,11 +22,14 @@ DOCS=( BUGS HISTORY LICENSE README.md TODO )
 src_prepare() {
 	default
 	sed -i '10i#include <time.h>' "${PN}.h" || die
-	sed -i -e "s#make#$\(MAKE\)#" Makefile || die
+
+	sed -e "s#make#$\(MAKE\)#" \
+		-e "s#^CFLAGS.*#CFLAGS=\$(INCLUDES) ${CFLAGS} \$(VERSION)#" \
+		-i Makefile || die
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {