gentoo resync : 27.03.2021

45 files changed, 394 insertions, 464 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e5345edb564d..04effb833239 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 3e44f9c79c88..c7179b1ecd1f 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,3 +1,5 @@
+DIST bgrep-0.2_p20210221.tar.gz 4854 BLAKE2B 85c9171572e440f1e5def3a902a4adb1a3339706847013c6ff139745a819d9eab48a9449bf89b631cfcfe0081365240eefcae46a68064f710178db6d2db50037 SHA512 a9488ee9fd68a1b0e9924cbdf1e36fb3517cdceee4b57a27ef148ccd2c3f51942f8a57b41d47a2cb5b65b376b0b87c92ca4ee5d7053714a725c57ffbabbf12b6
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
+EBUILD bgrep-0.2_p20210221.ebuild 751 BLAKE2B 776c93fdcd639867a50cfbcb84abede39c6c0fe1524f69c9f848bb3d5798bf5fbc75edf116413cdb7f7f1f286d5894f7356b2867da0155cf8369d8873d1b0ea3 SHA512 1a06e055664c0617e086e7a2683c379075d9832fd5084f930bb879a706bde59d70d1864d837618eee4e15094ed9478be8cbf9db442d8d50387c8c9f1e7c5a1d9
 EBUILD bgrep-0_p20110121-r1.ebuild 835 BLAKE2B be476291900a3b914cfb7615c4f49819aacae13adc798568b0683018ad80928c204264cd55e0cdc3ac2cc32cc5b0b080d46e29f59763531586b77f272d8b72ce SHA512 0eb81251c1f16f93fb9cddc2a5249fe897cca706fd30021140251e260d48fe23c72a87de4af71c0d57eb28350706139ae0c7522e8ae19c63b8a7e41e2ad0a3b8
-MISC metadata.xml 247 BLAKE2B 4dd4124b036016fe5a8788cc1d59340e0490958026874cb3dc532f8dcd493845417b21140d2c258ed0158b6d7f5391c6d714b77bc9a0ab199fbb6d1111411186 SHA512 1e996ebfddd8be6fac44c0a28fc7b4c961e4f9916433adf3e790f3cf8e900e6e1d72a11f4540213580fc5eec50528e45d7da6d4ad1f9e8eb764be2263154ea28
+MISC metadata.xml 472 BLAKE2B 2bf1cb880bb4bec129b6300a9862284b28c26d21f9250c924d8b01f2b285ef72dcbb3dc4398dccf955f20dfb9a25dc0f5e85327f3087ea0b5f9ffaa7c9e860e6 SHA512 d43b0586b8498bf4b2e75f82c345d50e155a4c26d4165b95ce03ccf6aa9f1a72633397cc87f410ae46a4fa4b88d8cd5b38249f11580730c16e0007c169570dd2
diff --git a/app-misc/bgrep/bgrep-0.2_p20210221.ebuild b/app-misc/bgrep/bgrep-0.2_p20210221.ebuild
new file mode 100644
index 000000000000..113fd29485be
--- /dev/null
+++ b/app-misc/bgrep/bgrep-0.2_p20210221.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="58c0b83f7ef13cd8d3d7352fadef88a006a514cd"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Grep-like tool to search for binary strings"
+HOMEPAGE="https://github.com/tmbinc/bgrep/"
+SRC_URI="https://github.com/tmbinc/bgrep/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-lang/perl )"
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp/|${T}/|g" \
+		test/bgrep-test.sh || die
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_test() {
+	cd test || die
+	./bgrep-test.sh || die
+}
+
+src_install() {
+	dobin bgrep
+	dodoc README
+}
diff --git a/app-misc/bgrep/metadata.xml b/app-misc/bgrep/metadata.xml
index cf3127a88ddc..d898893e4df8 100644
--- a/app-misc/bgrep/metadata.xml
+++ b/app-misc/bgrep/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="github">tmbinc/bgrep</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tmbinc/bgrep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index db0e462cdee2..ac3eb6ee99e4 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,7 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
+DIST binwalk-2.3.0.tar.gz 39603727 BLAKE2B abdb9909cf92a6cb35035c98467162dab2b009f5eab4bf255bba14ce82c2748cbd648977a54f276f2c141897b4e7a592d0adbde77a3c0f4164b04b7c328bc7e5 SHA512 74c25858eccaeff1bbf238cdff92df4cbec37dfff77204739bd82c35e4fd2329a8d0b13850b8b05900f756a99b898ebbbfb8ac44a26f37ca3ffb16c72402f9d6
 EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
-EBUILD binwalk-9999.ebuild 1089 BLAKE2B 9749014009bb0d2089dedb95f67fa594c299db27a79f917c8c974842f2a3d7dc7137aaaba48493423d250a5ddc75277836436f64d980e933283c51ab25cf0cb8 SHA512 25017f7e1bb1c6f0609312fa06953e16ab9b936b0a5cebb4029f57b1a884faf502a5e985384e7d71742fc2df60c37a4c270bb63bf8ced47bdebd1125bab6d34a
+EBUILD binwalk-2.3.0.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
diff --git a/app-misc/binwalk/binwalk-2.3.0.ebuild b/app-misc/binwalk/binwalk-2.3.0.ebuild
new file mode 100644
index 000000000000..d819647e95dc
--- /dev/null
+++ b/app-misc/binwalk/binwalk-2.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+
+distutils_enable_tests --install nose
+
+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-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 9aae5e3d511f..d819647e95dc 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
@@ -13,7 +13,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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
@@ -21,16 +21,10 @@ HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests --install nose
 
 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 3df5a86396e8..6a9ea0688776 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.7-r1.ebuild 968 BLAKE2B 0795785a2b8749202ce9cebaf97db07310c048ec7e5067deaba88399a80f2640f6cc8bcdbd022ae80ef67d665bd3e2346984449cafdcfe655839b9effbe27411 SHA512 a4a2ca37b81cb08f6ac28531efeba6141cf3d33c177f48acd4c09f776b52c34258d1d6af1dea12606e2f2980a434625409a7fb9234df468aa42a1cb1bbf27690
+EBUILD c_rehash-1.7-r1.ebuild 920 BLAKE2B 8d368dbd32d0c910b4a3ec3d103374e0aab051d7005d84c5fd44ec695dde01ee02c3fb5d48b13d8b243a6adfce9bfb9d4c3b71cae4c431af520cf4d5507083d4 SHA512 61bfd4d0c49c047e5dd93b37e52ec509c8c2701c421297e7c9412facdaef7e779a8232ae506ef793f88782e0dbe98c9934e7bfa5023d034d8a718d1c6352bc08
 MISC metadata.xml 339 BLAKE2B b8e32c0f0f6147fc8e3ef5842ee8d375648506528f60de787d132be280d480d2c4e6680df6f4e78d8ba8a906ea3e768bbf124d84a23800b0476db37d6c4d0730 SHA512 c66dbcf2f2ef7d99dc059e69c162237e9f3a233058ed05702d1a6b4e17d97e91fcffeca021f22558905669f65a3224f8a38a8dd0fa4107f74c53d5ca5bdd38c0
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 4f631bdca8e1..5ad7624ea5b6 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="c_rehash script from OpenSSL"
 HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/"
 SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}"
+S="${WORKDIR}"
 
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}
-
-src_prepare() {
-	SSL_CNF_DIR="/etc/ssl"
+src_configure() {
 	sed \
-		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+		-e "/^DIR=/s:=.*:=${EPREFIX}/etc/ssl:" \
 		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
 		"${DISTDIR}"/openssl-c_rehash.sh.${PV} \
 		> "${WORKDIR}"/c_rehash || die #416717
 }
 
 src_install() {
-	dobin "${WORKDIR}"/c_rehash
+	dobin c_rehash
 }
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index d88a6c58ff98..0439fb1a56bf 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,9 +1,3 @@
-AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb9334ab88a0e271ae0890b1fd3637400ab4e9bcf63e09741072a1bf81b34ce8b62392a166596f2ad08a1bddd916415df SHA512 fe3ffc7919576c2f1fe16240ed6915431fcbe569c16b629cfbb78d082c47c44b95808c89bec7b09201902a19f780577f0dc382d4da7275f2f096c034efeeb14a
-AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
-AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
-DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-1.2a-r3.ebuild 991 BLAKE2B 0af3a62dd77252d92cd992d0388ea3db2fcc7a6ba937dd41bb9e436f15d9cea813118c28a26772c2c49d6e913d19c9ff6dd9de401ad6b44cc42ca2a3f8c684d9 SHA512 bc2b9d9a3f3f48e9e33a3cf69d8074330d8799afabdd2fff792f198be1fcde5bdd62eb1163b2db9b8398fa672da5ef72a34468a45d1b38ad02cc68e93c152b72
-EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
-EBUILD cmatrix-2.0-r2.ebuild 1034 BLAKE2B fae14e81d2d010a4e35ff92511a7dac28bd0a63767231cb95cae788e7813f1c55cebf42c70cd5286dbc37dfa3c254d151420f88875a690b51472a195e86402e6 SHA512 a2846ed4ee167404c4e3eaa78b05ab658a9402f6facb34862fcffeba3389a183ea0c5067f01e3bcc1b11334a2aeadb8f098149f70b47b71d6a55ecce203eff79
+EBUILD cmatrix-2.0-r2.ebuild 1029 BLAKE2B b647b4f710a437fdb6905875e3a3d8df95dbf8a762f54a5706740a82cc449bd79f38917835a3823ad24f8d6cf071e57c3eb34ed50b5fd149246ef63b92c47a60 SHA512 4cb93f824a360b6231dae0262f882ba6bf9aae161e3e17391e830370d2ab21e50b5bfc21d357b7cb3bf74925f8d04538fae53543f2a6cf35b8e1c854e254cbae
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
deleted file mode 100644
index c684a70c88ba..000000000000
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="X"
-
-DEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-	sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	use X && eapply "${FILESDIR}"/${P}-fontdir.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/consolefonts
-	dodir /usr/lib/kbd/consolefonts
-	use X && dodir /usr/share/fonts/misc
-
-	default
-}
-
-pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
-			mkfontdir "${ROOT}"usr/share/fonts/misc
-		fi
-	fi
-}
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
deleted file mode 100644
index 7caf29f9a2ee..000000000000
--- a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools font
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-	sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	use X && eapply "${FILESDIR}"/${P}-fontdir.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/consolefonts
-	dodir /usr/lib/kbd/consolefonts
-	use X && dodir /usr/share/fonts/misc
-
-	default
-}
-
-pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
-			mkfontdir "${ROOT}"usr/share/fonts/misc
-		fi
-		font_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	use X && font_pkg_postrm
-}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
index e25ae2c50b2a..20bbda5977bb 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="X +unicode"
 
 DEPEND="
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
deleted file mode 100644
index 6e69841b5e01..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naru cmatrix-1.2a.orig/Makefile.am cmatrix-1.2a/Makefile.am
---- cmatrix-1.2a.orig/Makefile.am	2008-12-24 02:37:43.000000000 +0000
-+++ cmatrix-1.2a/Makefile.am	2008-12-24 02:50:08.000000000 +0000
-@@ -18,20 +18,9 @@
- 	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	fi
--	@if test -d /usr/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
--	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
-+	@if test -d /usr/share/fonts/misc; then \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/share/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
-+	    echo " If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
--	else \
--	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
--	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
--	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
--	fi \
- 	fi
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
deleted file mode 100644
index 5f88cd0fa876..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN cmatrix-1.2a.old/Makefile.am cmatrix-1.2a/Makefile.am
---- cmatrix-1.2a.old/Makefile.am	Sun Mar 31 17:17:17 2002
-+++ cmatrix-1.2a/Makefile.am	Sat Jul  6 05:32:06 2002
-@@ -9,30 +9,28 @@
- 
- install-data-local:
- 	@if test -d /usr/share/consolefonts; then \
--	    echo " Installing matrix fonts in /usr/share/consolefonts..."; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
-+	    echo " Installing matrix fonts in $(DESTDIR)/usr/share/consolefonts..."; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/share/consolefonts; \
- 	fi
- 	@if test -d /usr/lib/kbd/consolefonts; then \
--	    echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
-+	    echo " Installing matrix fonts in $(DESTDIR)/usr/lib/kbd/consolefonts..."; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	fi
- 	@if test -d /usr/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
--	    $(MKFONTDIR) /usr/lib/X11/fonts/misc; \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
-+	    echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
- 	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
- 	else \
- 	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-+	    echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
- 	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
- 	fi \
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
deleted file mode 100644
index 60720c7da8b9..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -8,9 +8,7 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
--dnl Checks for libraries.
--dnl Replace `main' with a function in -lncurses:
--AC_CHECK_LIB(ncurses, main)
-+PKG_PROG_PKG_CONFIG
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -26,18 +24,7 @@
- 
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 
--CURSES_LIB_NAME=""
--AC_CHECK_LIB(ncurses, tgetent, CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses)
--
--if eval "test x$CURSES_LIB_NAME = x"
--then
--    AC_CHECK_LIB(curses, tgetent, CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses)
--fi
--
--if eval "test x$CURSES_LIB_NAME = x"
--then
--    AC_CHECK_LIB(termcap, tgetent, CURSES_LIB="-ltermcap" CURSES_LIB_NAME=termcap)
--fi
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS";CURSES_LIB_NAME=ncurses])
- 
- if eval "test x$CURSES_LIB_NAME = x"
- then
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index d5b9f07f53e4..10b4e46e27e7 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -6,19 +6,13 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 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-6.8.13.tar.gz 149094514 BLAKE2B 85ec07c35077acaaafc8096ca5fad2c84617e30d545be36f0b5a8ea7e6344b17a87c6def42d1eab4635bf8dd4d08e632becf153f2c581f0e9d46fd0fe8de55a9 SHA512 8d76b8690a770b16b3dabbbd7f6a06a343b9e6437de8d250562dd005c860255783b8f015d5e3a9fed337aa24c4e256ed3eca549c6ecb0f9a6a8d6856586879d5
+DIST elasticsearch-6.8.14.tar.gz 149098495 BLAKE2B f1ccfcd9647a3584594a9db78f92488bc6bd5fe403c9b2cdff9001b87168136817084ce28eb8f14c6e54dd75b88118cf0eb6993e5502e74ecf826938f4c2ff57 SHA512 d7ca05707b9e3d8de19aaebc7811891a82897b2407f3de27ac95b2aad0d6669217c741e14bf768c3ea963977e3fa2ecc2f6d297aeafe985db52f6eb6780912b7
 DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4
-DIST elasticsearch-7.8.1-no-jdk-linux-x86_64.tar.gz 161598020 BLAKE2B 7950d9570760683a939c961c0babdf66a57adfc49d541d75716ce1dc379f211f60edceae06855de0f4bfe50c9a6b1ca0296aa58fe324a28b009fb8cfe5c2a5d7 SHA512 1fd0dc28cc12f4cafe8499ca2894a00f0aef506429a3cd5fa4c9ec006e4dd281099bd0f41f1e0ff9d67ef25d5d1cf3be7f6c43c1758ef3464ee4b650fb560842
-DIST elasticsearch-7.9.2-no-jdk-linux-x86_64.tar.gz 162795379 BLAKE2B 398815340c93db8bd00766e776b0cb0d2fe6a8cc64f706dc319385cf07714abc42ceade9d3bcdfa115189de604ebc1ba3a54ac9662ee3b1ffc0989206f30f738 SHA512 19bf983f5517338ee8a9e70df67cb8f14df19bab386c20a38118756e9d4a23baba38b94020a0dd6d3f7f4483190747386af99dd3e18e931ff6bd84df55b1ce41
 DIST elasticsearch-7.9.3-no-jdk-linux-x86_64.tar.gz 162808745 BLAKE2B e6a12ec3cc3bec0bdf8dd10680dd86214bf619b1abfdfeb8524b0b0f50a0f1faaf03b13f06ab62055f80c7987dd04b0dd9f2beba16dd59a5d346fc6cceb51acd SHA512 fea21591edc790b9d5c48151619921085d1b0e5dad1f8c43efbd44a58babeb8bfad52f4329f1f34c71d47618e24d7320c0e591f8eb65d15c2b9c3e1492d91680
-DIST elasticsearch-oss-6.8.13.tar.gz 68238766 BLAKE2B 3237641a0b4a36b36cbb48ffb13afa41555247d848ad4c561063418bab68832eb563974febd78a7391b6b5700ee54d0875661f3a283fa460175f842fc8734723 SHA512 e06b3486585e67f1e34e4268834b6625de6c4dcc380b15551306f42b02b5b2a0997fa2c26e82d965e6040cbf2367f399d4802e881fc649972382c895fa925573
+DIST elasticsearch-oss-6.8.14.tar.gz 68236681 BLAKE2B 09c6c23517b880ee1afb1c3472d4518172927c226386c7d0f2f5b9312e7de236bd6fa7d527b949e3cace759af6a1fdfe7d72f1ccf8e2c6e15919c4c8c989ee9e SHA512 c0372969ec9e5f7aff551bc0aa13684fdaccd5a553e8ee896979488ab2f13181642222ab4eca4dc799181bce1405200b5aea4866c830483ce1e484fa6a714998
 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756
-DIST elasticsearch-oss-7.8.1-no-jdk-linux-x86_64.tar.gz 75134201 BLAKE2B a3c88ad5f94a5cebefc1a5a3a913a62bc6c8751a78c179a05667f47da71c41b480edf8d7f962ad34aa8ab0eac8168d7b8cd57f33068c17ae7e0a8d5414fbc924 SHA512 f0caa06c1172b25d8f9cb9ddced72185aaaabb1b6d7f31fe1ba67172346236651ca3bc560e7ef206b4bf9521f228d46ee98df2e41b129253215135b583086ccc
-DIST elasticsearch-oss-7.9.2-no-jdk-linux-x86_64.tar.gz 75602317 BLAKE2B f81b785d3f9666a0f863d7423d7dc42b3b35b1a17cc0101fb61870d22ad35a50a56ae1d2abf7ace882f548aa92f2bb6cf05749d556e68fdbf1545cf6059d187d SHA512 282f6a273e8e8f1b1062f310b4f4826a827e2dc507b7689c073bb28e53ecbeadc9a6f1cba01006eafb28d6fdebc77d7eb672e38a554deef2ee8f6652f34131ba
 DIST elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz 75609441 BLAKE2B 5c638426c4fd64b877b350a6845da5d771e7ea222af245d50d9361ae27193e1ade555a060493b1ec056bd273d37656c37a11445b73866dc5347cd608a9d3333b SHA512 679d02f2576aa04aefee6ab1b8922d20d9fc1606c2454b32b52e7377187435da50566c9000565df8496ae69d0882724fbf2877b8253bd6036c06367e854c55f6
-EBUILD elasticsearch-6.8.13.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
+EBUILD elasticsearch-6.8.14.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
 EBUILD elasticsearch-7.10.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
-EBUILD elasticsearch-7.8.1.ebuild 2438 BLAKE2B 0d3520f7d4fbb3f8ed4c0d2934c9b8f93f7ca9f114a6e83d52abfc8a9b7e5b42ffc017c9aa7dab52c4ba5acd128c4f4fe58cb17dc5e13b7fb94b6bee71227cf4 SHA512 e4359d07a3245451230a0b129975e9cde5632a44bcbb41a6a28d4cbd845a392c5e72a9a5e9d325180e2ed67ff6cd26cc6d552ac5a4be40c1a5a07cd6ecdd151a
-EBUILD elasticsearch-7.9.2.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
 EBUILD elasticsearch-7.9.3.ebuild 2465 BLAKE2B 8f830c799809cd2d12d47398d0ebc5a457d37a1b379af832f98a87b22f59e374147ddeb5cfbcbc3350c71d59006bb1c33f6dcfb4d58580440d555bf3ca5288f9 SHA512 03c22a13310360daacd75a2894bd0f1d241b8f0c26ecf1f6256cdb20e060d6046e9a92fbf7e2be1aad22c7e477b1e47cf2d5652e7909b294111c339d49f7d3cc
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.13.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild
index 6b347e7957c4..6b347e7957c4 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.13.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.14.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.8.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.8.1.ebuild
deleted file mode 100644
index 8afc59b63222..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.8.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-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"
-	newtmpfiles "${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/elasticsearch-7.9.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.9.2.ebuild
deleted file mode 100644
index 826ad97256df..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-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"
-
-	fperms -R +x /usr/share/${PN}/bin
-
-	if use x-pack; then
-		fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-	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_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	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/g15stats/Manifest b/app-misc/g15stats/Manifest
index 63a8d5e29e1c..dfd68e649702 100644
--- a/app-misc/g15stats/Manifest
+++ b/app-misc/g15stats/Manifest
@@ -1,6 +1,6 @@
 AUX g15stats-1.9.7-docdir.patch 315 BLAKE2B 805d2b85153ccc1b551fd496467636d7f340265940f7b9bf7b9d4578367d4a7a6534d748889048e132ec4e3bb8695369b7a2260ee0a75dc2525d128cd36ef16e SHA512 90868fed8449d9da23924e294d5dc735e189dcd095a25eb02da557a28117cce559c6668decd805068e44064fd5e8915e38ee40fe66845f9b245e0442e9c2a7e1
 AUX g15stats-1.9.7.confd 637 BLAKE2B d85597aba7b14048078a60a8b7e8d2c782f499d649d30c5c48ae09bc545a2ae1642ab1776d119a1d6fddb7317c94e13d85a888c09507608257bd0ac7b3ec37a5 SHA512 f31ea949d3bdc1c8c18628f31ef0252a8d07a636055bff493cc368db702aea2d0d23b6b812d16040cd0015c1daf25357e29149d74e0bb3f233560a15df5ca58c
-AUX g15stats-1.9.7.initd 496 BLAKE2B 52bed11f8b0c9c084c1e1c313ea629cfbde5964b21f6bf7a8667544de6e702cb4b5a89a4022d66d53abfb6f4c14b43669bef290ab6041720e193b96f9b9482b8 SHA512 ad61ddfdbd60bf8906c6ee114ed01385bc20480225579a2034296231feb211eddc48fe8a088ea314822972f80a6df12d3f5bbea44e4e649ea7156b241457ff34
+AUX g15stats-1.9.7.initd-r1 505 BLAKE2B f78d9aaf04f9969e2a443fa5f485f319c1bf7a8fd2f097cb65c89013bdef3a7ed02aaf735bd1b359259831912546e00a9128ad10974f55589e26ac9699379d08 SHA512 e25608d7dc5e1c3d85a9febbdd1faec5d68807a8bb9da8e21e0adac1434a3fcd2afcfc798d485ee51dff5fb98f3e9d4caa1acd6ab5a3e841496d702c69c26007
 DIST g15stats-1.9.7.tar.bz2 24103 BLAKE2B ead6f95c1e320b975a0d3ace2c76c1244e5c36b5df60bb73133d19c2bab4f21e1a9d1c423baa9d87feae166861734c02fa60d7ec2e06a0ab764b77a0e00c7ba5 SHA512 de447dfddd563513205b29b3611b0558371b2a7fbe7bf3aa11cd997c0ee2767b3aba05df9745d15e5c0b81382b96163fb7d33ba6a77e04ac817c7a8e26e228ff
-EBUILD g15stats-1.9.7-r1.ebuild 983 BLAKE2B 5617484a315f9c27ba9eeeebf5e24aff4f79ecaf618e27c37601cb82195c23a2ca00f57d8e485ac0c019f0e7cbf606571602d18f527631fae22320126bc58050 SHA512 edec672e64cf48bc6dd714c6883510f1adb9afa7477ff465a875246aef839c576f812605cafd9e959a5455afa5ab18815d3c51e074d7182c149cbb5ce624d047
+EBUILD g15stats-1.9.7-r2.ebuild 978 BLAKE2B b955c934734d208a1ae32ae960c46e6fcbcfa534fab30613ae69372af38854494dfdea3962870a40b61c03b5fff6ad8e6aea457e14407f9c03dba6e96f80853c SHA512 81859651451aeafb5425348ccf48b5a5773b06b6e86a1da920eabf05be95633afd172ed306d07f47ee0a9e957c8b354ee0fccf3e4c467b43dd19f0fb3ef35273
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15stats/files/g15stats-1.9.7.initd b/app-misc/g15stats/files/g15stats-1.9.7.initd-r1
index 56a77d328ed4..d634deed6ba0 100644
--- a/app-misc/g15stats/files/g15stats-1.9.7.initd
+++ b/app-misc/g15stats/files/g15stats-1.9.7.initd-r1
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/var/run/${SVCNAME}.pid
 
 depend() {
 	need g15daemon
-        after xdm
+        after display-manager
 }
 
 start() {
diff --git a/app-misc/g15stats/g15stats-1.9.7-r1.ebuild b/app-misc/g15stats/g15stats-1.9.7-r2.ebuild
index 199760efdca1..65cd673d4d1e 100644
--- a/app-misc/g15stats/g15stats-1.9.7-r1.ebuild
+++ b/app-misc/g15stats/g15stats-1.9.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=app-misc/g15daemon-1.9.0
 	dev-libs/libg15
@@ -41,7 +40,7 @@ src_install() {
 	rm "${D}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
 
 	newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-1.9.7.initd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.9.7.initd-r1" ${PN}
 }
 
 pkg_postinst() {
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 96564f18c92b..33809c021b4e 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -4,8 +4,9 @@ AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a
 AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
 AUX jq-1.7-visible-null.patch 1428 BLAKE2B 109f45fc72bb927fb67202aadbcb61869d427f3598e2dd14eb47ab1983cf5a9978c873d1357e6ba3a23b931ce0b10dbe67498ee83b3375c2c67a3f97980cdfbf SHA512 39067401436538d85c65a51de3bcad99868d4c0b50d27717ccbfdbd7fbb8b011447fd6a326b4849ef94f57422692f032c8fab2974f8ca888b69a316616c26498
 AUX jq-1.7-warnings.patch 1302 BLAKE2B a38e9df57a74b8a19d70fe7d5aeb191e60bfb118f42f2ed3126626d601bd87549aa5c310c825687310e2eddb708e8c32a557f89f8073ac88ab8113cec3bb3468 SHA512 d5796a30684091aeeb0faa26170b675d9827a662299b122d0026e9ae237135636806aea5638e9b7d2dd5508cdd0726767f70d840e33894a8865f4acbb31ec14d
+AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
-EBUILD jq-1.7_pre20201109.ebuild 2280 BLAKE2B 8dc5faed9e3020ce63a080a0a61e47dc0157be4ed9ade031f4d12e68c39585ad33ed26341e0b4cc32f6eadb290ce856f4cf7ab0188a2af7ce653f91ad5b521d1 SHA512 84a3ee08112e77ad429cba0d3f101172b9179e85976fa26d4472366301d66ecfb3602d4152fb7eabb290702f749bbd272a4bd97bbb2961116783f9f0611e3ed6
+EBUILD jq-1.7_pre20201109.ebuild 2366 BLAKE2B 7cebf48801da2fc21e694835f6818fca6bab91650aaeb7af277cb7b38ed3a6e566c8e0f2c389a7ba7db59f7c63362ef47e91fd241ec65d2047210f2ea08fcb78 SHA512 baf4ace0ad546c8a04dbf784071891b2ea0de243a1e77f02855b8075c87e5d1942f8e994e1f98d317d50fd446d6cad976780914106d89484c8b373ddef985d20
 MISC metadata.xml 609 BLAKE2B 0ca0b4be60514d2a6ca287fab34e3e16574600fbaea6d924965242b27f25527f3ee3ad5b2c5ffbdb63662fba16511a9d70589990d4f4a506ecf7aba3e6541fbb SHA512 ca934d537070ea1ff8c7b6285870ee3aac60552b6b99e9fd7d361c157bb371926f532388d43e10570a27dbad008c5068ff4c9a17a05ffb14e7f95c84eeef19d0
diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
new file mode 100644
index 000000000000..726624df13d6
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 0441d4a..592ceb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,8 +1,3 @@
+-m4_define([jq_version],
+-          m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null &&
+-                        (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) ||
+-                        echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`])))
+-
+ AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
+              [jq], [https://stedolan.github.io/jq])
+ 
diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild
index 41e4b14e2afb..22f1f4f05b57 100644
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@@ -34,6 +34,8 @@ PATCHES=(
 	"${FILESDIR}"/jq-1.7-runpath.patch
 	"${FILESDIR}"/jq-1.7-warnings.patch
 	"${FILESDIR}"/jq-1.7-visible-null.patch
+	# https://bugs.gentoo.org/776385
+	"${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch
 )
 
 RESTRICT="!test? ( test )"
diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest
index 6985ea89ac08..4a34dca0e2ff 100644
--- a/app-misc/logiops/Manifest
+++ b/app-misc/logiops/Manifest
@@ -1,6 +1,6 @@
 AUX logid.initd 509 BLAKE2B 950294904989544d1dea65f516493a986cbe8556a17e66f7be0cd33f19d514b38e820c61241d32785d6f3607d6f2c6a2af4270ab60dc72dfcc5a5ffa7b91779f SHA512 bf98e11c87d9486dd3f59494eae7fda9536bc6a90166bf8fa5c4226d189a86bc83aa9192d0b8f6e962cdc7d0f76e295d50c7c345f9ae445926670ecfe3b6830b
 DIST logiops-0.2.2.tar.gz 64350 BLAKE2B 84a8a0a7efd9c1cb87f78ad8bb685f75f34952a95879d93a4db6782dcc1b416a28402cd68affdea25c127013be801a819bbf91a614718ec413374c47c8282c34 SHA512 49803fe383b04a3c6cb6b1d094c73b29dd30534c8faad0ff1a0b3a35cf031c8b2751d1368d6bb2fcb1be84c83a97b70bc31a0fad1e898904b5371a210a6e88f5
 DIST logiops-0.2.2_p20200108.tar.gz 69366 BLAKE2B 3a688123c6167ec365c2f538c8f36818662bf63f3b1cd98e26bb4fd32eaa6e026b3e1b9e8dc116a6b6988d7abcd34fe7506329a9453bbd678bbf6b0ec53fd4f5 SHA512 5072f85f7c9c2505a8e3e5e089383a22c6ff659ece35f6761f77c2b3c7bd65a8ace7351cefb387a46c2d9e1a904573c96bf5ef3d11f12300b699c1df2ffae3d1
-EBUILD logiops-0.2.2.ebuild 1004 BLAKE2B 7064a464cee391ac07914db3dd30241a3d1eb3187fbee277f60d02833e61d28a38111fdd402fa74cdf2e00257e7881b327dd0cae5b18fbfc14ed0fec9ab16f85 SHA512 8c79a77731025ff61526bca9c19fd90cb32966a22def50fddfd51ff80acb68cc3f2b4acd6b32c4103495571610d3c5b2ec1432da70889d06b87b87f17ee23b79
-EBUILD logiops-0.2.2_p20200108.ebuild 1104 BLAKE2B 3952e7407a265b6ffc7b2d5e005400e6a9a81500435397ffbe240217754af0eb9250ae7b599690095300bae0765b49b6ab033922cb0fd595ba9beea98902b3e6 SHA512 1b9c68de1c2108c574adbd8847d285ae360d5c85f81d45be675d4325445635d70e1d8ca8a2e6bb3842c7ff4b5dc491d491c7d01b8bc09baa3c814fda76c70b3e
+EBUILD logiops-0.2.2.ebuild 1009 BLAKE2B 978cf4360d03423231df59a0526ba11b6b7b447a35d7a00f6980b4ef7479fb8b4fd41ab797fe9fcbb2ce5f7b81d0c65db13a1ce9ced9076d5176c92b64017f35 SHA512 6ec573e8478900821ded86c029d929958b7478833cccfe50f97555db5cd5edbcd465e4e14fa8f5e0abed719810c25393b15d5b88e8b51b3f1cfbc10ab68b964d
+EBUILD logiops-0.2.2_p20200108.ebuild 1109 BLAKE2B 5a787e9f202a925fe81f006c479633e657e5ce4acb0393b96746d3c0bf5cdafe2411a5ce0d2cf7b87c523d0edddf112d036d641ecfde187c191eaae91d28b525 SHA512 e03c90b287f842e1d4fc9359b22e69c7baf8f9a55c3505af4ee0fbc986e896c723a47016da1771f663d6377a8825e31dac1c570cf812a90a817123973d4979d9
 MISC metadata.xml 393 BLAKE2B aaec420ee83380a435e6e5757f404d4ac0a9d6827bd35daf57807de0b0603e88308e1ecadca6c522afeccec6bb2e73d12970f2e5df180961fd9527b54f40351c SHA512 86b4e72e338e102564be34f04bc29da0cc3b4f78b608e31596f79e74dd85e074dac1f75d90fa1da9ae4fc62dbff8a35efc23bc9d16a52f147337cef795115ba1
diff --git a/app-misc/logiops/logiops-0.2.2.ebuild b/app-misc/logiops/logiops-0.2.2.ebuild
index 2e63d684128d..b5a8ed982127 100644
--- a/app-misc/logiops/logiops-0.2.2.ebuild
+++ b/app-misc/logiops/logiops-0.2.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 DEPEND="
-	dev-libs/libconfig:=
+	dev-libs/libconfig:=[cxx]
 	dev-libs/libevdev
 	virtual/libudev
 	systemd? ( sys-apps/systemd )
diff --git a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
index 56376f8f42ba..e0dd5d90a2b1 100644
--- a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
+++ b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 DEPEND="
-	dev-libs/libconfig:=
+	dev-libs/libconfig:=[cxx]
 	dev-libs/libevdev
 	virtual/libudev
 	systemd? ( sys-apps/systemd )
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 1471cef052c9..366c6ac09c6f 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 560 BLAKE2B f1fe5891b61b8f1238c29e97b077a0019c314893009caf2087eef552d3c8dc6bace056bc81d82ac6d10bd4a4ca6a907a93de49842c3f390a09f4f98ea91ac998 SHA512 fffb88d7f6194d7347009ac6f3220d30ea9da3162b8af63f01af45d5745f65ae5e6a897aa943a0eacec89729fd2ca73f46f209979b2a4778b0cf4c67ba418f3d
+EBUILD mime-types-9.ebuild 530 BLAKE2B db9e18d84fe28a427504fe8e857c0c15201c34933867c2b378937720feb4c8c7e9a023a2826d4298c715e476035c4a162b6db6a908d14f4e686051fcf78290a4 SHA512 3fb95b57ff741aeb234fad3116d28bbf40a588f344ebe018ed1a010a012ffad325df572abc86068e7883cb56e2270d7a6a4f2be1d972bf7df4e3144dc9e37138
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 7c5cc6c1f08e..0dbc34536408 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Provides /etc/mime.types file"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -10,10 +10,6 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 src_install() {
 	insinto /etc
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 9bca62d34f95..5cc5f502216b 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -3,6 +3,8 @@ AUX mouseremote-0.90-gentoo.diff 1130 BLAKE2B f219bba9912a620a02a91881e6bce1d055
 AUX mouseremote-0.90-makefile.diff 507 BLAKE2B c93decf07db9ad8f25c9ee8902b1e9841fe29e10c26cb1dc0c49736a3755edc25cd8545190b25aafc1b36d903e381f24e01fbf1a80efd04983f815883cdba09e SHA512 160efb2db998c42ab2efb34e8b462f3b709a03b8d4a8bf0be4c6c45c8204285e67bc6e5cecc4dd25ee71c6625b3e7653f83a2be8c51ed09103e2f119102b2ec0
 AUX mouseremote.conf 461 BLAKE2B 323401e37e6824b581ac63c947f5551b96bea35b9901310a039f86754ab35648b09b49fe5a01ce80be518fc6841b424d65c5ae5d1e64c8864035ca080183325a SHA512 b1e99866c0aec8036ea6bbd0e831afca79a5530ab1635fa1f6f407f7c49df5aa1df9c14e7e864fd6503063c05fc882792f6da4785e694865e4ef90d459a8e1f4
 AUX mouseremote.start 598 BLAKE2B 758b559aacbf1c3af63286cbe994087fd02e7c44d272ba1542d78b388baa7346240a5e0e66dada484ed877645e56a786ed6b7eaa4411893a66d88ea0e80200ea SHA512 9cbcd5037057498ccbe8dc4a16308f7390112389440cbbcc4675b2750bfeeca2c54b1fd3da5d91efb3f2e9bcd453b125c526c3412a1e30fa56a937183aca7abe
+AUX mouseremote.start-r1 607 BLAKE2B 5a260f70faf0fe6ff119c83193e04a497b9865616763de970b978a92e53c63a2ca4e7c36a9e35403ee2b23fe23baf8610bf17d07fd3b0d57eca6d8ef872418d6 SHA512 41783d068e8c3a2d835edde5b8e3d5f124418a80abeadd770d1b62d3fb2b7a654ae62a6008bfac074640fd61307f56dff66d953a234dc4aaa5a6cadd85bdfdc0
 DIST MouseRemote.tar.gz 41752 BLAKE2B 90e80bf4d6584db567e035c293460bbf4d30592fa6c25a6cf97769f4e9879b935ef597d8073f429e630e3fb4947f9e8cbdff7450cb5c3b64d0f482e576e2905d SHA512 d92ec4a1efda7e63cc02283b2aabcd6b42bedba17539371856e6ca3b6b5feaf9c306604db9a781836375afb6da226c16b8031f5f749d367857c2cde28e097483
 EBUILD mouseremote-0.90-r2.ebuild 1945 BLAKE2B 7bd0b8a6b5bdfc7f8e1485a1f0dd1d28ce83d832175460321e4bd7527824bce590d846d8c440d7e588d336871bbc5f981e74e8b181de82a0dbcd5c69d8e3ee52 SHA512 0463baf4ac6a0d07a85a15ea46b04fd08a3660d23ee5a027e924498063f0b22bddb3c7444ece5667f4a1991d7499509474b774a2992282185b5091ded5fe3814
+EBUILD mouseremote-0.90-r3.ebuild 1939 BLAKE2B aa57173ac7df795283d317f4aa863cc028a1f9a113f08e980f0eabfd790f023dacd653e0ded24ff5a4ec6e3996a0d866ace27c192843b6120d1772269d783883 SHA512 4a42985eb3cc9e5fd3c578ddd271efb3e2a1b51e3e969021253b589391691343173cb743de67f41faa589ab6144f6c9cb8d36daa6db11d736e84b493ee17df05
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mouseremote/files/mouseremote.start-r1 b/app-misc/mouseremote/files/mouseremote.start-r1
new file mode 100644
index 000000000000..fd6aa9c854f1
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote.start-r1
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use modules logger
+	before display-manager
+}
+
+checkconfig() {
+	[ -z "$DEV" ] || [ -z "$DRV" ] || return 0
+	eerror "You need to setup DEV and DRV in /etc/conf.d/mouseremote first"
+	return 1
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting X10 MouseRemote Server"
+	/usr/sbin/multimoused -${DRV} ${DEV} 2> /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping X10 MouseRemote Server"
+	kill $(cat /var/lock/MultiMouse.pid)
+	eend ${?} "Failed to stop MouseRemote Server"
+}
diff --git a/app-misc/mouseremote/mouseremote-0.90-r3.ebuild b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
new file mode 100644
index 000000000000..a64b724d8b6e
--- /dev/null
+++ b/app-misc/mouseremote/mouseremote-0.90-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="X10 MouseRemote"
+HOMEPAGE="http://www4.pair.com/gribnif/ha/"
+SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/perl-Time-HiRes"
+
+S="${WORKDIR}/MouseRemote"
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-makefile.diff
+	eapply "${FILESDIR}"/${P}-gentoo.diff
+	eapply -p0 "${FILESDIR}"/${P}-fix-warnings.diff
+
+	eapply_user
+}
+
+src_compile() {
+	cd MultiMouse && emake \
+		CC=$(tc-getCC) \
+		PREFIX=/usr \
+		LOCKDIR=/var/lock \
+	    JMANDIR=/usr/share/man/ja_JP.ujis
+}
+
+src_install() {
+	dobin MultiMouse/multimouse
+	dosbin MultiMouse/multimoused
+
+	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
+	newdoc MultiMouse/README README.MultiMouse
+	newdoc client/MouseRemote.conf MouseRemote.conf.dist
+	newdoc client/MouseRemote.pl MouseRemote.pl.dist
+	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
+
+	newinitd "${FILESDIR}"/mouseremote.start-r1 mouseremote
+	newconfd "${FILESDIR}"/mouseremote.conf mouseremote
+}
+
+pkg_postinst() {
+	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
+	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+
+	elog "To use the mouse function in X, add the following to your XF86Config"
+	elog "Section \"InputDevice\""
+	elog "	Identifier  \"MouseREM\""
+	elog "	Driver      \"mouse\""
+	elog "	Option      \"Protocol\"      \"MouseSystems\""
+	elog "	Option      \"Device\"        \"/dev/mumse\""
+	elog "EndSection"
+	elog
+	elog "Don't forget to add the new device to the section \"ServerLayout\""
+	elog "like:	InputDevice \"MouseREM\" \"SendCoreEvents\""
+	elog
+	elog "Enable the daemon with \"rc-update add mouseremote default\"."
+	elog
+	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+	elog
+	elog "See /usr/share/doc/${PF} on how to configure the buttons."
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 55e5f17f1290..a5f61ae5247f 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 EBUILD pax-utils-1.2.6.ebuild 1890 BLAKE2B 5178e5c8495e24305743efd40f8a1a656efa0673b46854fe32c2c6cd2fadb6d7e51b0ae9a67a3e1ff5ab45d5f60f681699d52426c1b7b767ebf14cb709a6a8e8 SHA512 f3534814ed8b649c568e00de1c1c1aa01759c715fe5228bc6f00f990e973840e48108dac2ce6a3df25783d8441d7d651e91072a2c1a2c543bca7a6692ee3bab9
-EBUILD pax-utils-1.2.9.ebuild 1896 BLAKE2B 76d23260e4931ab9fb662fd3877588bf9a97dc676715295ee51f0ab4326417a1cf3a231010609978254f33cc4eada65e712acb0b5cd60bbdf633160f06a0b972 SHA512 1789ca639879708109d1e12d4e41d0c42c73d537e11d33f6f82734efe121139ab5fd0843ea0252937f152e3f8d9c3ef38d53065e39366ef616b345b9df33f1ab
+EBUILD pax-utils-1.2.9.ebuild 1895 BLAKE2B 0993bbe0514d2242501c53637ce8bb4c5dbe326e1e02c4ba95b394b9b82344dd0728ea8efb32ff816ade88a7b3844231871f12bae743de048fdfdeef096de77c SHA512 d8c6b880cfaf6a6a2ebd41cc3cffcf9f87d7b271f78ce039ab610fbb48ca010b720851e2ae65ed8fe731b1bc135281d9d67c2a60b4d6b0be49c30b1644c8cbdf
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
index f624b65e7847..af56cab4443d 100644
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.9.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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index a92e6aad0930..7522714f774a 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -4,6 +4,6 @@ AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 EBUILD screen-4.8.0-r1.ebuild 4115 BLAKE2B 5d9bff693395a3a104253585b30561dda21444540420a68d74ca7d9ca753d79fbb26f82164bf222a659545dc570189db0641f1437f329edc3066630fb0c69f95 SHA512 60d6fdf67117a025cedd504bc109cb519f96defeb7cdded86b5a473641d89969cbdcd939c51849249dd43e1e24ce07ecefdabf9f74f469bf1458d54defa6317f
-EBUILD screen-4.8.0-r2.ebuild 4158 BLAKE2B 05754b07214cbdbef6569408e697e503b171639bb795f4f2a00902ab539a33fbf25cf7e8de4bf3effa1e8eadce6f95c4a4cdedb4541e215a0c29cf27be140a17 SHA512 b16dbfa0934cbf58e72989dd30b5bd19abcb4bedd81aa2169d88f7bb06995b368ab57801212b6b114b69e163489446803547bd2b07a26f6690af3b1148f5566f
+EBUILD screen-4.8.0-r2.ebuild 4157 BLAKE2B 13dcb91f276d83d8b90b6877e38aaace35c57413178f40417f961cb99bf55f9bab6992ee60d8ae15eadf50ecd0d3ec8d38bd18ad7b2453d47ebe86132a85caab SHA512 917984a3d3c2f3d3e83eeb388fab95a3333c0a6a514705a1c44ea0bd067d8c5781f51efabb20849b7cffb25eda2a650ad3801eca31ca43ef42b810e61e2692b3
 EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild
index 589b58f29346..8c0c7cfd6710 100644
--- a/app-misc/screen/screen-4.8.0-r2.ebuild
+++ b/app-misc/screen/screen-4.8.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/tpconfig/Manifest b/app-misc/tpconfig/Manifest
index 09133db5feb2..01f4484607c6 100644
--- a/app-misc/tpconfig/Manifest
+++ b/app-misc/tpconfig/Manifest
@@ -1,5 +1,7 @@
 AUX tpconfig 426 BLAKE2B 8ef3bef0ca0e50d6f220c4ab7cefc9002bdfffb6c018173d181c3e1dab6cc0fca07c3e8fca4c251efc308f24324e382c7477267a18ca792c993a1247e8bf75be SHA512 09c0a954b765404eeee569040b832883f85b2451c41ca4465ef5febf80745fb9a65fdabadff9967f014d064134c353c66953c26e7295b4ced3dbc172975d536e
+AUX tpconfig-r1 435 BLAKE2B de3e2f28f81c59690f910ac0706c9e5df239a44150ea5924969ab7cd13676bfac5c680ed6771acce2fc249755867a1d9bfc038bf1634f0d5365fde7cafead5e9 SHA512 a096eaf1b287a6206829f09c40b578045bcdbdbf4d44e9ed3f3a0e691a119ba16820c243eca5ddb06f4cac5b5cdee73fb82bbf7ae1bf0b9a9997cb9fb7740638
 AUX tpconfig.conf 132 BLAKE2B 9d5f6490eee22c619d458a5190889867c1995f294aec1ed60bc6edcb2c83b3c47d94c473ec52d367eadf441e73258bcb5e2a0ceb0e578b6c0df6069231514649 SHA512 314f05fb3211790e9c5de47f99d14bcf96788f8baf1d5258eb17d71dea05f0bde7b249a99321f472e4339c066705d9f18b529f97b1c03a72da4f21c14b91f77a
 DIST tpconfig-3.1.3.tar.gz 106789 BLAKE2B 1a02a1c91ce2174ae406888a73ad488d79e60941d0e904f47c9ff1cc82319780cf9874ede6ec4b18cc9176bcaeb465c201fca1bdf5840029565e5a3c5cac85f7 SHA512 b10b709f113dcd526c7521f519466677a1dd37b5c3bd4adf7a0fdbf95428bf56777a726b85e158c4842d406e7659f1b6e161c68bc6f6c6739d376ab84351efc9
 EBUILD tpconfig-3.1.3-r2.ebuild 534 BLAKE2B cb4b2411fadb25132ac0e55ddda395a152642b4c570c72eae6e31b9de20b26d3f0981a3474741d6c793c7db56dbc51765c6d738aa987ecbea7d900a351e67ce1 SHA512 8822a2319a4445a1f9e17468d418cca8fb41196fc1490fc863a0a633f4155f76ac9aaff8a71271e926a066df5522e04170af8d2cb881c069b0642a3c2ef8e3aa
+EBUILD tpconfig-3.1.3-r3.ebuild 548 BLAKE2B d3c0b52f0787a0be78a319be3279fd3f0d657755d589ade5dab2a69b3a93e9c1da0cebd71d717e782f3c6c905615e4745e3dfd9e5be338a0a268d93e79bafac1 SHA512 02eacb3139c1b2f158720b18247eded141f424357e9137825913129bc3e2aaa317e6a92d052c5d921a7ab817f4b2ce5025994f30ff91733ba4d5436cc08d6fd3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tpconfig/files/tpconfig-r1 b/app-misc/tpconfig/files/tpconfig-r1
new file mode 100644
index 000000000000..10020958a03d
--- /dev/null
+++ b/app-misc/tpconfig/files/tpconfig-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	before display-manager
+}
+
+start() {
+	ebegin "Loading tpconfig options..."
+	/usr/bin/tpconfig ${TPOPTIONS} > /dev/null 2> /tmp/tpconfig.start
+	if [ -z "`cat /tmp/tpconfig.start 2> /dev/null`" ]; then
+		eend 0
+	else
+		eend 1
+	fi
+}
+
+stop() {
+	ebegin "Stoping tpconfig (this does nothing)..."
+	eend 0
+}
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild
new file mode 100644
index 000000000000..b80c3d28c2fd
--- /dev/null
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
+HOMEPAGE="http://www.compass.com/synaptics/"
+SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	einstalldocs
+	dobin "${PN}"
+	newinitd "${FILESDIR}"/"${PN}-r1" "${PN}"
+	newconfd "${FILESDIR}"/"${PN}.conf" "${PN}"
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 5815b42f57eb..9eea53dc56e1 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,3 +1,4 @@
 DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
 EBUILD vifm-0.11.ebuild 1780 BLAKE2B a194381f233f025f8a18cdbdc989921fb52d8a72a0acefeae24c69b6ea8c0cb16e599f007e848d537de1c80888415f44678408a880cb7f3ebb4e890c7be82e2b SHA512 b27a656abc42fce68750e7fe71f22e214cd02276940c930134e3bab10c725a14bf87905b717782c0bd503975768cbf474433dc53eaca957ea6e6a2830dd5a54b
+EBUILD vifm-9999.ebuild 1735 BLAKE2B 688aaae57026fb8dee116d87937a3068b596f8c209f207ffd20b157f52d5a87e3cb23eddddc4c1a6f735b26d67b0d7589d47356dfe74c21df1a34f48916c3848 SHA512 567bc9e169e54fed4097b6f42f16febd8164126490001a002f4e23e610dc87368046318b511b4a0242857e35b597afb532428498c0fd61ffbeb50f46b759ebdc
 MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/vifm-9999.ebuild b/app-misc/vifm/vifm-9999.ebuild
new file mode 100644
index 000000000000..327c50b20c44
--- /dev/null
+++ b/app-misc/vifm/vifm-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 autotools vim-doc xdg
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+EGIT_REPO_URI="https://github.com/vifm/vifm.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	default
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/doc/${t}/${PN}*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r data/vim/${t}/${PN}*
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index c692f1f0fb40..52ac3d2c2ba9 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -6,5 +6,5 @@ DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cd
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2139 BLAKE2B 219105f6cc823877aee66e25c32cef49ed171f1d009c99d937b0337a6e6dd1e42e6209fdaf205231f8764c960f3540a962c41bfdc03c54a78bd9753901ff7c9f SHA512 ffb2376e0504c90a8e55b346cf70410d50d41150d043f187ec80f3e6bdfd54926ab83e38ebb422b29ea9de68e30db9afc9903b498dea00cbfc7736833f281220
-EBUILD xmind-3.7.6_p201801311814.ebuild 2101 BLAKE2B dff125728a53e483577ce48ab966d686423644cc36322ec951a7d197ba27d486ac8dc3b40e8c4a48407eaf04df69c3ccc039c25233d105a3be4b644728b699a7 SHA512 0bcccb050701a227d6f77136949f8770832ffca4015c104482918f9738cdb8b24b147113eb0e4f5d8a37ee62e3a29c5aa8bbf725918d8cbc70d91f4b9d4570b3
+EBUILD xmind-3.7.6_p201801311814.ebuild 2088 BLAKE2B 0180c2846ab2ae85ae03d7d6b8be46917a57d31dd3f15b2260b92f079c10f7da1b6156846f3097da53e9785ad33ca52e54bc39c62b7642821293a58ad69769ee SHA512 1cfc77297cb8d94d8107d9dd11e813e6c38d5b8a9b47f1a4d492bb67aa3aeb001d61f4f2a0a706b700cb5ab68b23cd3e017c1da81bf1e0190fb367d3f17e5869
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 869813d042d0..9999a65deaac 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -1,30 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+MY_P="${PN}-8-update7-linux"
 inherit desktop font optfeature xdg
 
-MY_PV="8-update7"
-MY_P="${PN}-${MY_PV}-linux"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
+DESCRIPTION="Brainstorming and mind mapping software tool"
 HOMEPAGE="https://www.xmind.net"
 SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
 	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
+S="${WORKDIR}"
+
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND="
 	>=virtual/jre-1.8
 	x11-libs/gtk+:2
 "
 
-S=${WORKDIR}
-
 QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
 QA_FLAGS_IGNORED="
 	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
@@ -36,12 +34,7 @@ FONT_SUFFIX="ttf"
 FONT_S="${S}/fonts"
 
 src_configure() {
-	if use amd64; then
-		XDIR="XMind_amd64"
-	else
-		XDIR="XMind_i388"
-	fi
-	mv "$XDIR" XMind || die
+	mv "XMind_$(usex amd64 amd64 i386)" XMind || die
 	# force data instance & config area to be at home/.xmind directory
 	sed \
 		-e '/-configuration/d' \
@@ -83,3 +76,8 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	optfeature "audio notes support" media-sound/lame
 }
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_pkg_postrm
+}