Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
commit: be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree: f82923fbca262493e83dd1382e561a2fae24cc46 /app-misc
parent: 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent: 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)
68 files changed, 627 insertions, 781 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bf23ea07e669..b5fd2f714332 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index 93283a3d176b..15ae71e53c7d 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -2,4 +2,4 @@ DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e3
 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
-MISC metadata.xml 708 BLAKE2B 4ae481813c0b910f9cc97a236dfccde94c3a8a5017b3168b96d45f719d6cdce5598005de5a5d045eeafc5efeec279399ab9254340fe2531c77b163e20c2cbc50 SHA512 93df341ab2c4b830e7c5d5beb0baa72b846c236c63ae893290032579be309a5a3ea033f14168886fa9356951cd54a68e0645705d9fddde2229dfc2cf80734767
+MISC metadata.xml 522 BLAKE2B 46bbeb1dd0a4ed305a71aad81f6cc505ab1994ed6f1f4d04f608523f1570cee1efc69394dd50c3e3e77409a90dfd29ecc5a60488a319074bb40a5ce7edcfa1bc SHA512 419afcca69423826de2226f6d577d610a1565d499e001531563e3f4c7952da0b5c8d7824a7d35359de153e68434de9c8326f9406d9833387423d66c7c111426c
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index ae7d6197d816..f7edfdd7ca6b 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>hendrik@consetetur.de</email>
-	<name>Hendrik v. Raven (lorem_ipsum)</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-	abduco provides session management i.e. it allows programs to be run independently from its controlling terminal. That is programs can be detached - run in the background - and then later reattached. Together with dvtm it provides a simpler and cleaner alternative to tmux or screen.
-</longdescription>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+    abduco provides session management i.e. it allows programs to be run 
+    independently from its controlling terminal. That is programs can be 
+    detached - run in the background - and then later reattached. Together 
+    with dvtm it provides a simpler and cleaner alternative to tmux or screen.
+  </longdescription>
 </pkgmetadata>
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 7c4afce4c8f0..88a7c3b00e5f 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -3,5 +3,7 @@ AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c4
 AUX init 477 BLAKE2B 9f0ce8f2c5c17e526f49d25e744d00f3784e672ef06e30fd3033e7b76a5221fc3ffcf68618e6434dfe7eaf83a361d4c6faa7799ce5342d5c546edc3f0930a499 SHA512 cbeaeac8a993711822086a761b624783bbf4ff11cff5c569a4c0cd3e6e174fe36904a661155c1460f7b43e0b2d6b631cd9e290d76138520021a702567b0494dd
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
 DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
+DIST beanstalkd-1.11.tar.gz 73386 BLAKE2B 345873711b4d40c17044dddfec02a03a95cb42b274fa2a3459227aba585678c1b3e192947c4c82e9b6688050e1add5623c38ed75040a1135d523c888706d519e SHA512 322e6400c36fb3d7b06b7feb3e7dde5e64137382fb81ca1f11e3b9f72b4246ba719d139a571efcde9fe1738ba0e9e05a6ce3ac2d49a9628f6d455c81ec2a033e
 EBUILD beanstalkd-1.10.ebuild 1052 BLAKE2B a33b258f2ba61e14b97c91a7bdb1ba086fcef9863c698e72fb32ce13fd04e6a39b54dd96be74f20bd8fcd3c7d1b559978a3d388a2e16d8e890c883208e6c31f5 SHA512 40275b672b14f144421067d42ed765ce76b03876f648a34c138bbefd983ae397936d256b0f1c413baebe65cc91324f4650e6b405ac4d4158bf1874676c3fdc2b
+EBUILD beanstalkd-1.11.ebuild 985 BLAKE2B 729045c56f460a1d9f517308885cf16edfb0c41f81854ce959c578fbe22f57c0afeac260233378ccb1168c30e657569f6928fe21814bc4676a73d9ce035c6c9c SHA512 d8cca359f0e66c4f48b08fc15a49b0f295c23a62c09fe8b9f741cda0205290165e4d929f8c8296efebceaebedaf5aba3517caf8ef4f34414a133e510208e1ef1
 MISC metadata.xml 436 BLAKE2B 72356d3a95f45dc54e13946b8d41e698b60d44205e9ec90cee10d916f71ed0e6ed2a81929cbc705c8eeae00587790b2c4d2439a0ca366f28cf123ddcf3137f38 SHA512 7766293e42fb4786e971b259480f4e697745d23db9b332e24c7edda52d8ccbc2ebdb1ed1b1c9265f22d9ec698fc144acd6e7576cef66f3a33db8a4f102b08140
diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
new file mode 100644
index 000000000000..427eb779418e
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="A simple, fast work queue"
+HOMEPAGE="http://kr.github.io/beanstalkd/"
+SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+
+RDEPEND=""
+DEPEND=""
+
+IUSE=""
+
+DOCS=( README News docs/protocol.txt )
+
+pkg_setup() {
+	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
+}
+
+src_prepare() {
+	sed -i -e "/override/d" Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dobin beanstalkd
+
+	DATADIR=/var/lib/${PN}
+	dodir ${DATADIR}
+	fowners beanstalk:daemon ${DATADIR}
+
+	doman doc/"${PN}".1
+
+	newconfd "${FILESDIR}/conf-1.9" beanstalkd
+	newinitd "${FILESDIR}/init-1.9" beanstalkd
+
+	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
+}
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 9fa91fc51823..e930f2ae8f2f 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.32.2.tar.xz 659988 BLAKE2B a155b3ad4d340b6efe039ae8458be6665f5ea37935b2040d8aa59f4b019a7ce2a9bb42c309fbc212b8f87cd2e3db533305b64d6987b3b527435ab9906165a7ff SHA512 71573ced01a5e984998fc5ce97ebbd4fcf04a91165465697ff29ea67076a31654b8f66a93c3ed79b30a8af2e38fad3ac4bfc3047106411078c6cbb67c20d5c5d
 DIST bijiben-3.34.2.tar.xz 663348 BLAKE2B 7736823334c5439f1da93e81940f6a433b48cf94173606b1985912b408ebaa05d14866b0bbdd0978c08456fe5a592829203aa7fdd31291748148d7973ab3d8ab SHA512 75e1286aabd5c0d5aca3d2150aa36f18873cc0bfeed24a1b6aa9f4d78318d37712df71929f453b2db871021f4df148af8a9ef64d563a2158db8c1dbb620e4538
-EBUILD bijiben-3.32.2.ebuild 1064 BLAKE2B 620d83c31ee5c3bed23deeb6014b0450dfbb8fc26dde69c66352b1047b281fa07ef18c2ba516e255ddb353276463aad6ad7f8a0f503d2ee634e5a1fbf3c45d8d SHA512 f37803a34b7abd2819591eafafa56b5a081cce5f43ae7dd6a575ea6653c4763747a191fc85af9a6ad1050b773fd6eb08dc35037a618592099baefaa216714023
-EBUILD bijiben-3.34.2.ebuild 1024 BLAKE2B acec0535a9ba6db7b3dc1704576b4acbacb76d7abc6a17a8c8da1d4f4fa42d357019f09558eaf04864b7419ccb65a9113a8155b8db4b79df2f8b1967435b43ee SHA512 e362a8383b2b34867ba6aac6c5e367e250be4943336d9c5fc971037340bf12fc5688ffa3cec67736ecb547f60ee4e371767b480a220f871d793482b7345b5a34
+EBUILD bijiben-3.34.2.ebuild 1022 BLAKE2B 759c55fda7d2cc300295130996a086b0bec250bcd69553eff6703e88ed00bf62c1850e9bb2154ddcf085205e0ba98cf0b63cef6006dadabbc2914969734f51d1 SHA512 55cd1b15ae716f62737f922fb9b99e357c6b805e7341d8441bd0719bda92748f73be85694a326761fb7f3ae95896e836e6c475041e44da04ea7ac72209f1a8d9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.32.2.ebuild b/app-misc/bijiben/bijiben-3.32.2.ebuild
deleted file mode 100644
index 61f2246946e1..000000000000
--- a/app-misc/bijiben/bijiben-3.32.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-misc/tracker:0/2.0
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	<gnome-extra/evolution-data-server-3.33
-	dev-libs/libxml2:2
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.10:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dzeitgeist=false
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store is mainly meant for flatpak builds
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/bijiben/bijiben-3.34.2.ebuild b/app-misc/bijiben/bijiben-3.34.2.ebuild
index f83923e7b5fd..280d613753ec 100644
--- a/app-misc/bijiben/bijiben-3.34.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 5a198ee30e72..a6f7501d9be5 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,5 +1,5 @@
 DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
 EBUILD c_rehash-1.0.2g_p8.ebuild 985 BLAKE2B 7e68fe19402a98cdb46ce550317c1bdf228ef4ffc617aa9d3231b45a1f38dd18756614288275f662662199a9f1c70c1a8b1fa312cd8e5b31c2e2f0c85313516f SHA512 e4bc03edaa4c75cc2086e345dce05195e6ca7edf71db854c5143d43ac9b5a8ff4ef38257dacba1860aa0d5a3a9d4085c40e3380b388efb0c71efb522df78da5a
-EBUILD c_rehash-1.7-r1.ebuild 998 BLAKE2B d5c5fb11e4bbb881ce905813709a624a99e8557d0d8e41cecb85495d7c09de0a2c1bf5d66edbaaaf4d5150efd039b2cc6c8f24257e25e2644ac172e0cd7b883b SHA512 aef00aed6414d569d1a8b9b408a57f8173639e7edf1fc2fa0a4aefb7ae0e60c9f7f38621b03929f7a590e913762b4d055c167aa0c699cc6a14e90fcd050e51c7
+EBUILD c_rehash-1.7-r1.ebuild 999 BLAKE2B 31290f6f00b80048fc76e3d6b4a9b5e16b5e867f145c019e82f7a6c5a9c3d32b6bf22fc966c2d7ac56394fb7a68cfdcc90ce874172c0005bdbeafe261595fcd8 SHA512 a6179384d7b37ceb32f89ae4cbf0ce967ce48600934a2822077517390280591585177948b979245a759e6ecbcbda662f899a7b8a79c12d0da0d58e7533a5988a
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
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 2c187763f3be..04e92b9aa0e8 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
 
 LICENSE="openssl"
 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"
+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=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index d57d4c78490e..91745b2847e0 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,5 +2,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5770 BLAKE2B 128b095a01b29be9caf20d1d66e64163c9af37daa69904a5fd47b89df36bc0bad15a8f7955b644d6c6b7ae18e3e17eee6e140655ba3e7a16fa012186812051c3 SHA512 83c84d9d7b7e8ee95f4a881cfd5b459949dc9110b62286500eca4fcf9aeb8c50b98771ce174637a77118e9b5ff9a684de3e8a4c53e7d40d0742736c4b04e1158
+EBUILD ca-certificates-20190110.3.43.ebuild 5773 BLAKE2B 927d1cbccb998ccb5286abf1b5bde99feffe8f31bc115f32cffc560a8e3c6d948a1290ccd094b2907a8db688ee74968c2947fec3e3aa83ebdd7d18a422d4f959 SHA512 89a403d3e7c90535c076dab313dc810c4b7031a423a43141333c71cfbce32be020b6a3c58ddc99b75f719da295233ea515f16edff57d2c5863cfe05265733278
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index 5e4f5479ce63..21fd74495d09 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils python-any-r1
 
@@ -59,7 +59,7 @@ 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"
+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"
 
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 2257dcca5cc0..cbae62141b4a 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -2,6 +2,8 @@ AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb933
 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 990 BLAKE2B 8f301ac3c99e6def7994cdb3fc5f8401d57af05d09251385bbc722b9e70be54739f879c9d217a9a28139b7ad7e6fa6b7024e58b9de1d89727dc3c003f3d5b704 SHA512 719ed4360766f99c242fdbb0971bdcabf671ef3f742544b573248977af0e6b4f8a262f777e917a40e32476b67238b9c321fc7177d91aed47113710d14b99d198
 EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
+EBUILD cmatrix-2.0-r1.ebuild 907 BLAKE2B 9d73d8e3f7ccb112a7d14b5c26745104a01e0ed7531f98df4ba939228130eeec1ab94cdaa8562107c1b094a62fbf76d723c3d6bc9dcd416d667bda2c979ff548 SHA512 d20d8be45944a88c85f5b208278321da248cef8fb50552c042fa68ff1c58fe9d9417b4fc96212f4e920f13772be014530847bd5675ed7824fd581035fdd90766
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-2.0-r1.ebuild b/app-misc/cmatrix/cmatrix-2.0-r1.ebuild
new file mode 100644
index 000000000000..c691bbc100c9
--- /dev/null
+++ b/app-misc/cmatrix/cmatrix-2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake font
+
+DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
+HOMEPAGE="
+	https://www.asty.org/cmatrix/
+	https://github.com/abishekvashok/cmatrix
+"
+SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	X? ( >=x11-apps/mkfontscale-1.2.0 )
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+src_install() {
+	cmake_src_install
+	font_src_install
+	doman ${PN}.1
+}
+
+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/datefudge/Manifest b/app-misc/datefudge/Manifest
index dc2fcbf0250e..6b23e85f49a5 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,4 +1,4 @@
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
-EBUILD datefudge-1.22.ebuild 972 BLAKE2B 90a74afdd3aed0e24664363a97e3705562e87ba7b36a3cb89a289a2c283d974dc9fa1d05fdfa96cace72d0465477b5714abf4037b70d4d74a9c8fe19bb421142 SHA512 2f0751972056f2a749b4371762e0e5a987a700e874b159dc72790d34af017b5a8159ae4c9393104238257d3bc34e3c0ff75594611f2b00bd7068e61abb763b37
+EBUILD datefudge-1.22.ebuild 973 BLAKE2B 9427b1f03d460a0d78989f8a9796e2b187c993287c9c2037cfe9515de95d2ec66e23fbcaa9af4d157d0ae7760a0dac9f47aef2ac4fb1a1a45f43ba4b303d53b9 SHA512 3aa437ab4cb0142b67e7a4b6ce4c66fe4afad4ac777cb6a4c42ea23bd1fd0781086fe4ed3219b16c1c4490cc822642b58dd40454f917483ed21397a7d930e8df
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index fc70d16658cd..326ae6f60c97 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/dfshow/Manifest b/app-misc/dfshow/Manifest
index af565a6ba5a3..da4739c5c4fc 100644
--- a/app-misc/dfshow/Manifest
+++ b/app-misc/dfshow/Manifest
@@ -1,3 +1,3 @@
 DIST dfshow-0.8.2_beta.tar.gz 97733 BLAKE2B 99790b6901760a5e4adc7942fa84d11fb9d5e2f4e60a5d4abc2ce8fed0e86ab5f3def67c2f567b1ca54f1ecdbbe04522d4a75d69694b0ad213a69d86d49514e4 SHA512 1fca7f72c0200df13ac6e640314f9ad94ea3b88eb62a18a606f3a06a02252107f59747fbd404891fff5898b3796650023827ca59ceb690a0aa45e3c0a8bca749
 EBUILD dfshow-0.8.2_beta.ebuild 737 BLAKE2B d172580efe123e969118b89e31c235f244a7767e2500555b6ef08fbf47675e6f4396d8b0d0eff11d8eb6f91c29bda3e4d73fd047abb5ee2abb1b7d51c2f5c56f SHA512 9b3f8bebdf15d474dc0fe8baceaac97af80f4e54cd8a77ae12480f774d5e8aaaed038a8b4a8e3393545173cd0dd58589fbf8d63745f52c4fe69ff7ba39424fe7
-MISC metadata.xml 637 BLAKE2B 30ff2ed55699e7482978875ab5af6058eb9ba91ff46756df7a2b6fcdf93f01026c87c61ed3ab1cbf2ceea9fbcb9e85730457bdcb93bd8f6461e869fc55398a82 SHA512 ca6da84af5bdf429ca98077e5656a4704771d11b9e0b13aeade9d0fc375634f4c50a94c57bf8866ded03c19cd99b7866f48b26fb1c271847816812b758fc6eea
+MISC metadata.xml 432 BLAKE2B 070e05fa430c4198c17b388d23dcf7dc75bd7249a3de6d664399a1a30bd26126b18098b11c144ef639b63b5cd8d5988e95cead669c4cac5081496d8ed19e5c7e SHA512 ebd53dbe275b79137bdc3515674b9a23afba5d727b5deeb63b41e97e069fd2873e5ec322b6e4635a227c9a0a2ee5080755b4c8d5566a5a24abc74ee9c965c812
diff --git a/app-misc/dfshow/metadata.xml b/app-misc/dfshow/metadata.xml
index 6ba2366d6cce..8a953cf29241 100644
--- a/app-misc/dfshow/metadata.xml
+++ b/app-misc/dfshow/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pepitsizous@zoho.com</email>
-		<name>Angelos Kouratzinos</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		DF-SHOW (Directory File Show) is a Unix-like rewrite of some of
 		the applications from Larry Kroeker's DF-EDIT (Directory File Editor)
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 3030c7d508fc..61d54a0c1277 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 932 BLAKE2B 59df0cd302212136586014b0f2285b81bd956d509b40a24b6bce5915dc5dc43bb577eddf93082b9508c3776babad30f695f04203c48cf7cbdd622161f9a76e2b SHA512 cd37a9821c0198c77ad409507e35e4cdece6c385033ce1190d9aa97251ae4d24cbd182d3fbe2442ada484bcb1989254252744256647792e970827f0e5a251c55
+EBUILD editor-wrapper-4-r1.ebuild 933 BLAKE2B 11ed5bfa29f4746c2730e828a212d90ae965a2fc6c62f5def440eba50b0ccdc4070835ec3afb6fea7f20954d9e57b59166aa26e052975bfe8ed4244938c33806 SHA512 a8ae9619af8b31835cd752000c7d078b8248e720a8efa3e762c0438927b8869dba4e3503dbe2b8c83c0c64d7a18b1fbdf03f836653929ce01e0238451f0417b9
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 7e4574094a90..4370535e247c 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index f3c8dd3efbee..d35d119f2379 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -2,7 +2,6 @@ AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab7684779
 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.5 2050 BLAKE2B 51908266d476c0fe21ceeb01e4fb9aede5ef70944025a26dbbaea582253e32442a938e39842371397b15c70ecfc9ae4abc8f549f75c3fdf55e1d09e16c25f871 SHA512 127f050a322ba2fd1ca92352ccfc9e3abf5e768b0c1b6e6fbb73633f4aa8fb3dbc8c9118428ed56070e91e2141edda2cd488185a272f0d0022e88ca32172cd7f
 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
@@ -11,26 +10,11 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 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.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
-DIST elasticsearch-6.8.7.tar.gz 149923635 BLAKE2B f6945db5f32f8c674bff311a88957e4742d123fa31019704f9139b275506618a8d68c08306bc11590ce604c3884327ea7d5b4d98c4e1362ebcf9330675dd198a SHA512 d3232a7e58076a581ef904aa5a14fdd146e0558c166a0e71262a20cfd2eb1891df8cb0e526e4268c241444bcb1521f2115e532a0f87a9529524f3228aeb2f702
-DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
-DIST elasticsearch-7.3.2-no-jdk-linux-x86_64.tar.gz 140098396 BLAKE2B bb2eb1e69b459533ed785f244ebbdf06032f8115f298e4151164fa27c913c6cff674dc8e75d96734185ffe47c2dd16dff11f3f7447a21bd0020fd45e58abf5d4 SHA512 9d73f6fce0b5321099393c69b1ba8544f9fc919f5a850bac3eb5a77af50f392e8eeb20ff34ba85283649a19d9bee33351a4ffd363cda848d4d53cde91632e335
-DIST elasticsearch-7.4.1-no-jdk-linux-x86_64.tar.gz 140407217 BLAKE2B 5bf378d66a199de45375e9e07e650e9cdd8fbdd8868c8a81928571be4aaf2d2b1bacf6cde8e216a98b448d1d6ef0db89b2b410d5b2d0bd5e0b40309b7e68f7e6 SHA512 7714a0bd8a69bf921075b2020863469e9d44896e73b383ca073cb243eadd29dc9a76936530c33304fb2e8505dfdc88b7591ddca9543ee1cf11e74df3bebd5b25
-DIST elasticsearch-7.5.2-no-jdk-linux-x86_64.tar.gz 141758515 BLAKE2B 67b6a844c671ce5d33e16282c34ba9cb82d19511612f775e6e238854c1074fef33d03e0a001a111ffd514a3397413ab335c53a1d947cfa43c3a1221da3de065c SHA512 64d6b3f1d30869f53f26a7fc60b8ff7f6e06457bcd437404cb157801a9faeb6a61b890c52eadd614fac1fa18692a07383d01e539d52371cf84f23b5b1dbc73bd
-DIST elasticsearch-7.6.1-no-jdk-linux-x86_64.tar.gz 148131656 BLAKE2B c613168ff660038a0c34c50463aecf1ce3fa17b5dfd6032745ba49486c2b4283d7b5c4ae429be67c8523014555dec2627b431abf3bce53f817d3d22b31d2fab9 SHA512 7f5f73a0bf66052df7db95c0bd5219ee1a9662118d90a65b012afaf4eea16a6c4146f375e981260e4517743ccc48df779ccb9d9d59918124a8dcb517abd3f37b
-DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
-DIST elasticsearch-oss-6.8.7.tar.gz 68646087 BLAKE2B c97dacb7f98dd6ce8980a4a0bd327bbaa8705cd045ed1ddc95ce1d0d3d8a535e2f871784b60247468b3cefa2e7401cc881ab6a4197aa0688c10abdf41774722d SHA512 ace12a099112ba16f8298d789dc0d4866349f54bdd66a9a6ba9bca08efb4387558d9962b2b2c28f3ed8ed1f02b1982dc13f7644f8805819137219c9a02fbaba1
-DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
-DIST elasticsearch-oss-7.3.2-no-jdk-linux-x86_64.tar.gz 69289138 BLAKE2B 2ab3658a2acf1899f44fb29252932862759dd134ffe4872daac15092f9a08b536492197b9cd44287ec48a7aaee1c3f78edf2957f807aaebac866bc835972a592 SHA512 abb183a05db25a877d4e5a8f8b75fba517444008f34e35e82806a6239c3ccec1c32dc787313b899be55caefdab8343a62db31f9491bffbabefaecccaba1210d0
-DIST elasticsearch-oss-7.4.1-no-jdk-linux-x86_64.tar.gz 68527811 BLAKE2B d8965b429d4ee9b7becdb0ff407ac1ae03322a5c17ab7e793569fdd4ebffa302d95772e7ba0f4ae505fd07b62c2e6983d57db9feec7fd4da42676166287b460b SHA512 a652905b130ace0097b5f51df1d2ef5977d0eda8b551acaf7b3d7015397b054f83a868874fdc96b95e2c780c65552001ee2a90cb7b9f88f43b5ea813d0b078dd
-DIST elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
-DIST elasticsearch-oss-7.6.1-no-jdk-linux-x86_64.tar.gz 72567711 BLAKE2B 8fe3901cb3ce6577918f6b711f63e0ed8f10013a01ae8c197cda8e5592b2e7c99f0bb7179decc19e26ed160c21d7cfd66eedc3d6fc265e89244ce1c9a5ef27c5 SHA512 da396be8bceec32b5f4c4f9091edee51710f39f5aa1135c7c392719d9fdd0c99e92b681cf628135013a37fd881dd15540d6c660a50bb18b47991f0d723aadb64
+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-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
-EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
-EBUILD elasticsearch-6.8.7.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
-EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
-EBUILD elasticsearch-7.3.2.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
-EBUILD elasticsearch-7.4.1.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
-EBUILD elasticsearch-7.5.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
-EBUILD elasticsearch-7.6.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-6.8.8.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
+EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild
deleted file mode 100644
index 80521b9e40fd..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild
+++ /dev/null
@@ -1,91 +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="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-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.5" ${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/elasticsearch-6.8.7.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.8.ebuild
index 6191d3d9e2e0..6191d3d9e2e0 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.7.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.8.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
deleted file mode 100644
index 37f142d87742..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
+++ /dev/null
@@ -1,86 +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="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="virtual/jre"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-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/elasticsearch-7.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.3.2.ebuild
deleted file mode 100644
index 4c17fb08c836..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.3.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 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/elasticsearch-7.4.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.4.1.ebuild
deleted file mode 100644
index 4c17fb08c836..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.4.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 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/elasticsearch-7.6.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.6.1.ebuild
deleted file mode 100644
index 2155270debec..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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/elasticsearch-7.5.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.6.2.ebuild
index 2155270debec..2155270debec 100644
--- a/app-misc/elasticsearch/elasticsearch-7.5.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.6.2.ebuild
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.5 b/app-misc/elasticsearch/files/elasticsearch.init.5
deleted file mode 100644
index b9dba6ca5d58..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.5
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${RC_SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	DEFAULT_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"}
-LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
-
-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
-export ES_PATH_CONF="${CONF_DIR}"
-
-pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
-
-command="/usr/share/elasticsearch/bin/elasticsearch"
-command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
-command_args_background="--daemonize --pidfile=${pidfile}"
-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}"
-
-	# fails to start without keystore
-	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
-		"${ES_HOME}/bin/elasticsearch-keystore" create
-	fi
-}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 90bf4ce9b33b..2923564d0f85 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,3 @@
 DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
-EBUILD gramps-5.1.2-r1.ebuild 2054 BLAKE2B c5ae8154cc93b82ba0ed477833a02444ce55b524a58bb3218757eb62cc9b9aa609a3c94e97f995dcfd0eccc538d8dd1ec822d3794b7ee956f9e9e772c4e5581e SHA512 88e0155ff411b12a89f179181450d1ab9020f8a7cf24accd95f9d5606b64dd83b3ff653367ce3d1bea38912c14bef918d04dcf8d339bfc8e9caa840e834d76ab
+EBUILD gramps-5.1.2-r1.ebuild 2323 BLAKE2B b237c48264b0a5c6f539571b266b79c1927d38b7732a3b0629422d170a5b04d2f53117accc943ee488d5ae3302c09f003a8c48be3d1615df7e1ad01835a0f7b2 SHA512 3ae328cc32a25f906ef43cd792b668b92a18c4395c5b1ed60d90b0b535142c3edf0b27f69f47e5b90910c49d4b874c84211fea4d7bf296c48b8d8f6b01f6f5d0
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.1.2-r1.ebuild b/app-misc/gramps/gramps-5.1.2-r1.ebuild
index b05f6a7ce789..86a7c50dab9e 100644
--- a/app-misc/gramps/gramps-5.1.2-r1.ebuild
+++ b/app-misc/gramps/gramps-5.1.2-r1.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
@@ -20,11 +21,11 @@ IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
-		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
-		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	')
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
@@ -62,6 +63,17 @@ python_test_all() {
 	esetup.py test
 }
 
+# Ugly hack to work around Bug #717922
+python_install() {
+	local mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+		build
+	)
+	distutils-r1_python_install
+	echo -n "/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index b14e4b16ae0a..7f97eb174ba6 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,6 +1,7 @@
 AUX gentoo-alt.logo 1672 BLAKE2B 19cd7ac8cf29cb253cf2a2b44be7f369ac840f6f891e19bd550a2b6ae0c4098d10c28bad4003c83f7cae5a462f66d676393cd855e96dcd51d6234c86d72b8fda SHA512 7068100889469c489ec327fa1aaa9503c6b54b350b2d7786ad1cbd9bcafb92630220820defd01089d3dc52c7dab2c2f2787aef4361430f8dc97894b46f3d72de
 AUX gentoo-linux.logo 4788 BLAKE2B 3b130f25770a7d39c2a86bcb7c09aefb254721de7ebae629eb55faa2ccf435ee6bff147b7b230493e31c6f678e30746b21275e9eb7a93369076caa309dfdca45 SHA512 63f72473c05073258c47b0b24bc8dea4e7f3e4e060d8296ae31eee2dccb93c159ed473ef23924e96fa47a4796150e16c542908d55312a660ccf0696904962fbe
 AUX linux-logo-5.11-add-aarch64-support.patch 422 BLAKE2B 29b9163b930192d5fc83e549d5bf2e149e1a5d85aa6485fa3b60ca964d5e376c3d0f26cc63c3a28f6e1d85a3ecdb63594a48d3bc0726c7bb7aea4c8e676d0d6f SHA512 0af44f11d7aa4c96be50e77d65a966b56002a7b8903d5f109695e2151f7bde64a52645ba291b429dcfb7c5cb2cc2d29147e88ac0db4d1a2589e63427417d0133
+AUX linux-logo-5.11-configure.patch 1460 BLAKE2B 1a8b7eda9344ea23e17069b32add1afef018e906691764a7756ba9ffaa9b608bc430ae13cdc2aea27b3f872fbeb6f6dd5376fa75f4d221a02746964b2253c0cd SHA512 1cea59a513f02e2c2aa3ba3d224b7de3dd497947272c2dae40a7d5380f943d617a822ea4154cfaea1b4698ae7030894be2385bca2424344d42fe25686310083a
 AUX linux-logo-5.11.conf 1225 BLAKE2B c84f6722843d01052a40b5270e816d35fad11423c5072107c5794aab14dceff6494659cc6a5ea381a905f571f87da599f6dd50a1325370de57534b67b5b0ec88 SHA512 b277fb20fb4db7420fad63f7412513f992471e64985d9e8f7ed4d3975fc9c5dac4ed777bc3b0cf6138bbab5a38c519ae75039bd89e42503b75e7d5ce191846d1
 AUX linux-logo.init.d 938 BLAKE2B 9760e591b1500a4776eaf1f24eb0903dc6d1a21102c2cf45373ab3a7f104ae87bfd31476c5bed7be32119a36764986f0de98f9a3eeb0d4bd6a750109adbd0b2e SHA512 0c021418a4e7e31df3aada8bd3c7cebd97f8e812d086a45aaff5d5779650195e92e87072a3627a3bb50384f10fccafd78cd966c8daed6775bbe58f6305e6db53
 AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71d1e7c359499617a2065e74f500884736e8becc3fa64907feff8a06b2644c1337e295d3f24383b47c7ff SHA512 01b5917d1a7a70faa2622e459f4e27b5e23f15481ac94cae51ee39799d15f783a6427c7430067208a7a73e6f270527c1e64740c6eb31ce0f17a4777343bc3261
@@ -8,4 +9,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
+EBUILD linux-logo-5.11-r5.ebuild 2282 BLAKE2B beb00eaa05d1075dfae1ee11650e36e619a3c9773ac27d86e6485e2842af6bbf74957494aeaa31a310129e1af1338e32ed1bd8ba0aa88b9d546a48e02e9ff3e9 SHA512 c085b8f05f310098ef3effddc8ad3651fca8801d8d5ef6f0d62b205559dbc1ee4ec58402671e7fefb8dd76ea57a16c6889e5240d0c3a3a2d194078b674dab952
 MISC metadata.xml 490 BLAKE2B 86e3962880353e6e86dbbf5d6582140126a5d2c56eff5e110119aa9a77b73051258ab4624220733da236e6ab438aeb6ac11102481a792afd4807dcbcdf669c11 SHA512 103652d3e84265d69b041a3268935de7fd1935c0cca90d905656d845009037774e46cae7116fccdac64c3fdb919a1a2b011600ea1858277117420bb63b5740df
diff --git a/app-misc/linux-logo/files/linux-logo-5.11-configure.patch b/app-misc/linux-logo/files/linux-logo-5.11-configure.patch
new file mode 100644
index 000000000000..a699db0485e1
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11-configure.patch
@@ -0,0 +1,78 @@
+diff -Naur linux_logo-5.11.orig/configure linux_logo-5.11/configure
+--- linux_logo-5.11.orig/configure	2010-02-19 23:47:46.000000000 +0100
++++ linux_logo-5.11/configure	2020-04-23 23:35:47.468728737 +0200
+@@ -41,31 +41,8 @@
+    XGETTEXT=xgettext
+ fi
+ 
+-which gcc
+-GCC_MISSING=$?
+-
+-if [ $GCC_MISSING -eq 1 ]; then
+-   which cc
+-   CC_MISSING=$?
+-   if [ $CC_MISSING -eq 1 ]; then
+-      echo "C compiler not found!"
+-   else
+-      CC=cc   
+-   fi
+-else
+-   CC=gcc
+-fi
+-
+ LIBSYSINFO=libsysinfo-0.2.2
+ 
+-LDFLAGS=""
+-
+-if [ $CC = gcc ]; then
+-   CFLAGS="-Wall -O2"
+-else
+-   CFLAGS="-O2"
+-fi   
+-
+ $CROSS$CC $CFLAGS -c intl_test.c 
+ INTL_MISSING=$?
+ 
+diff -Naur linux_logo-5.11.orig/libsysinfo-0.2.2/configure linux_logo-5.11/libsysinfo-0.2.2/configure
+--- linux_logo-5.11.orig/libsysinfo-0.2.2/configure	2009-06-05 20:53:44.000000000 +0200
++++ linux_logo-5.11/libsysinfo-0.2.2/configure	2020-04-23 23:39:32.874812532 +0200
+@@ -15,39 +15,6 @@
+ PREFIX=/usr/local
+ INSTALL=`which install`
+ 
+-which gcc
+-GCC_MISSING=$?
+-
+-if [ $GCC_MISSING -eq 1 ]; then
+-   which cc
+-   CC_MISSING=$?
+-   if [ $CC_MISSING -eq 1 ]; then
+-      echo "C compiler not found!"
+-   else
+-      CC=cc   
+-   fi
+-else
+-   CC=gcc
+-fi
+-
+-which ar
+-AR_MISSING=$?
+-
+-if [ $AR_MISSING -eq 0 ]; then
+-   AR=ar
+-fi
+-
+-
+-if [ $OS = SunOS ]; then
+-   AR=/usr/ccs/bin/ar
+-fi
+-   
+-if [ $CC = gcc ]; then
+-   CFLAGS="-Wall -O2"
+-else
+-   CFLAGS="-O2"
+-fi   
+-
+ LIBSYSINFO_INCLUDE="-I.."
+ LFLAGS=""
+ 
diff --git a/app-misc/linux-logo/linux-logo-5.11-r5.ebuild b/app-misc/linux-logo/linux-logo-5.11-r5.ebuild
new file mode 100644
index 000000000000..f63e15d1e14c
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs systemd
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
+HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
+SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-add-aarch64-support.patch
+	"${FILESDIR}"/"${P}"-configure.patch
+)
+
+DOCS=( BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp "${FILESDIR}"/logo-config "${S}/logo_config" || die
+	cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
+	cp "${FILESDIR}"/linux-logo.service "${S}/" || die
+	cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
+
+	# Remove warn_unused_result warning
+	sed -i -e 's/FILE \*fff;/FILE \*fff;\n   char *stemp;/' \
+		-e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die
+	default
+}
+
+src_configure() {
+	ARCH="" CC="$(tc-getCC)" AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" \
+		./configure --prefix="${ED}"/usr || die
+}
+
+src_install() {
+	default
+
+	dobin "${FILESDIR}"/linux_logo_creator
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${P}.conf ${PN}
+
+	# systemd support
+	systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
+}
+
+pkg_postinst() {
+	echo
+	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
+	elog ""
+	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
+	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
+	elog "To display all the logos available type: linux_logo -L list."
+	elog ""
+	elog "To start linux_logo on boot, please type:"
+	elog "   rc-update add linux-logo default"
+	elog "or for systemd"
+	elog "   systemctl enable linux-logo.service"
+	elog "which uses the settings found in"
+	elog "   /etc/conf.d/linux-logo"
+	echo
+}
+
+pkg_prerm() {
+	# Restore issue files
+	mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
+	mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
+}
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 07c15bc0b6ad..5d4e61c862f2 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,5 @@
 DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
+DIST media-player-info-24.tar.gz 90017 BLAKE2B 4b8dff7ebc910cdee986756d211f7cec0c08d5089bc5478360bcea3d24613118d3e2557633866345b1970a39a1de5ff10648ea71b7ae6ec7e7ae5635b6d46bc3 SHA512 b762f82280d7ddc3ecc4cf612f6fb3bf887c56a3ece7d9e4a45ebc7e750d71a20ba70dbff63c2b5abaae0f1c3e079545e95d8eff07ae25e27add09e92b2b1544
 EBUILD media-player-info-23.ebuild 1041 BLAKE2B 3a1852063e09a2abde60b36c507c42adae4db2129d9bf14b79eb89510156fc29450bbe40a5bbfc1b6043532d436d4b3472f5f59ebb57b58043c4288101abc0d2 SHA512 12171293c4a653e040adf57536b8e0a57ce39903735304954a6ef5733ddb4f48feeea797aecacb1b4b9e15c9aeaa826712e9495bf246f49652fd554c02be5ea2
+EBUILD media-player-info-24.ebuild 1005 BLAKE2B 824da1611293537632eb756b2c454642f2968a26a8746a90d0cadb9816e375791dec2bbef8f8c760c8a12a16e1f630edfeb7ee289da4dfb9a82711c5197c0e09 SHA512 32d1d1a076ce47ddccdc7f372205aee7be6efa786d3dd99dd3aefc8871ce6c26d7c560fbed76816553a7cb24a56091dd77c25c67c08217d8a1b1f8f9eba6bf0e
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-24.ebuild b/app-misc/media-player-info/media-player-info-24.ebuild
new file mode 100644
index 000000000000..a9f5a6034635
--- /dev/null
+++ b/app-misc/media-player-info/media-player-info-24.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1
+
+DESCRIPTION="Repository of data files describing media player capabilities"
+HOMEPAGE="https://gitlab.freedesktop.org/media-player-info/media-player-info"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+# Upstream commit d83dd01a0a1df6198ee08954da1c033b88a1004b
+RDEPEND=">=virtual/udev-208"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+DOCS=( AUTHORS NEWS )
+
+pkg_postinst() {
+	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
+	udevadm hwdb --update --root="${ROOT}"
+	# Upstream commit 1fab57c209035f7e66198343074e9cee06718bda
+	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+		return 0
+	fi
+	udevadm control --reload
+}
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 39bba2c18ea7..0c70b86784c2 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 590 BLAKE2B 98c951f2b4157141b67ace94485c3da81d4fc511b9c6e4e0f704baf08e971ca87a224604f8edc9efbe75b73e06041d1379583d1a756949c13f9cd87f6ceedd28 SHA512 f71e1f0d104a77a3add30c46674c9fadcc4f031246752ca5620e22ae94d0d32908f46c579e678dc2511e5f60390935e2261c12ad5fd2d43697a06091be0da673
+EBUILD mime-types-9.ebuild 591 BLAKE2B 9ef7940e4ed23c11d84dc131f94b5c55a5ee8b504f60e553401e32f68e333bc5734a2100806f0b608e53d0d389461e0abbd7298e542d9caa4724b188c794a883 SHA512 8a9ac4390005bd2b363fda77ae6498250f7d3b53785e0531f575262ed4717593a0d3343119bc127271d6de7579a5059e35e5467d73b612f62d8dfef09ae303de
 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 8ad5f5b7e40c..fd5c643f1077 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index d3094fd8cc28..6e0f2e1ad54a 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -10,6 +10,7 @@ DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97a
 DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
 DIST nnn-2.9.tar.gz 97998 BLAKE2B 4affc609e2fa6c21547c6f9b97778a4c5d6f9dcfac3d3eb8c08c76362dd18c163aec1d2a72c4450bbdab26abf9a4dd1da7e0a74bd6be8cdab87e21046270ed6b SHA512 7bc64901a317de79cb9e29502cda70b59ca681ddde53385521a08e49cbc32fa10bb76ceef2e911838c0bb7be4f5018dce4a1906e77c0ca9f1ec8164c82da7bb2
 DIST nnn-3.0.tar.gz 102636 BLAKE2B 7756fa859198b61dacea5fade8d89f7903d012fac40034d544dc6d1b044362e3d1cce01f014af274cdc13ca40c6b95ce72f735b33053c553772aab6a4c16138a SHA512 a8092e1e5970e1f48baf04a3f9f7064b2efd61bc54bf993b0545c1c2148d775c29328b8e51d5b3f94340de82a468be8547bdd6bb40023811bbcfb755d611435f
+DIST nnn-3.1.tar.gz 110005 BLAKE2B 13acf91c3333c00a1524e4bc819870768272509b6d6aebe177f26a90d27a64dc7ffd9725d94e6edeac30b261f6d63e03757f116d3f4e293ed0b06e41f66157c7 SHA512 f17bdcf95bba3eb50d20cb06725022bcdc2fae34a365e55dea1baa49e40c567e175a3d5c66fcf70f560e64a8933f0ed9a8ca39af67fd39edcb81c82be5aedca9
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -22,4 +23,5 @@ EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09
 EBUILD nnn-2.8.1.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 EBUILD nnn-2.9.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 EBUILD nnn-3.0.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
+EBUILD nnn-3.1.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-3.1.ebuild b/app-misc/nnn/nnn-3.1.ebuild
new file mode 100644
index 000000000000..88ef20531476
--- /dev/null
+++ b/app-misc/nnn/nnn-3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index fdc5d8387352..96f849028b49 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +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 1770 BLAKE2B df8bd69bec363e947c5ecfbdcafd831eba4e7429bfd66444d120fcc1d136de2ba4526da2022a4c043265c4d8b41eb9f10bde13f55db8c6d8952ea98fb3fb7765 SHA512 ab6579b31c1f46c5aa5b26cdf23aa73c9ddf9859b331826335ff481019356db620e2edde0522db5b193778aab17c72f9597804f9d979019c4c1fe807a5f50ccd
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
new file mode 100644
index 000000000000..d39090d1af7b
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-single-r1 toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${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"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 1e3be29944c8..ab67136b8ed4 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -6,6 +6,6 @@ DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c
 DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.17.ebuild 1918 BLAKE2B 3e79be7f31a6d7987f5dc3b7ca8fc38f169527e6376bd70048ecb9c21653b627365ca0ba078cefa910b756b830d1775eed08b1cee92382094ca983443a571f15 SHA512 3880ac2faf76c0bceffcb0b1801d337e5e223f3f6bd425c1260c47cacb69c98f9b953ff9f42a37fc763fbc5cc350c6e1bc709872f49b0c770d60174668e85202
+EBUILD realpath-1.17.ebuild 1919 BLAKE2B e6af2621e1433156e6c3a5afbb270a824b8415786b82f6b32534ae4d0841c5123317659d545cbd6ef299c12e6a80644b7904fd67f783c8862d2e254d07a70e9e SHA512 151ebb7ccafa13b1493a07817bb3dfc8cb172109456200eb772716b15cbbc559b8ca3519285c53e8742d5e61834ca0bf501602aecebff924c5b9aa429fbc7c4e
 EBUILD realpath-1.18.ebuild 1938 BLAKE2B e5d24bacb8002d2ab2f8ec759af23c920d36552a1e6b26858afd18450ac01967a0b129705a7246eabdd398b3a75101b3399ff3bcc1913224ba6baa3fe4ac53c9 SHA512 cc365ceebe8e5cc1511ddd0a3144af802010d37a5363b5a9278f61436331a3d96849de98b98df265d378c9415f869dd5ad42e25b85c2541da61f8bd41bd7d25b
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
index b9d87aa10f63..36b4ba0a92cf 100644
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="!sys-freebsd/freebsd-bin
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index b1dccbe23643..490693760711 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -6,6 +6,7 @@ AUX spacenavd-0.5-destdir.patch 649 BLAKE2B 7a3159e7820c03cc5d38ca54a732abc46c24
 AUX spacenavd-0.5-no-x11.patch 388 BLAKE2B 14c4cac74d5eb13d2c3619b5dde2296f934dfb6215dfe72538d2135eaddf39097100d6e048fe8dfe5e3acaddba02582d7195f7537a6e10b2bdd4e97864430a0a SHA512 d6cb2d6337b3e19ef56f5e0ccbfdc731b038009df852b3d1f7272001aa18e70a1701c3af2d1b4976cac7392a6176c0f4cee787d2c9b4b96ba029d1cc0db3d7ae
 AUX spacenavd-0.7-gcc10.patch 842 BLAKE2B f86fe95b3ac6936ca4be6712fd0712cc4c389502988739df6b06e6e5321d8420e6adb31befa373e647d1c10ee4fc9b8425d97a9677c85994eab09d05ebf06aac SHA512 72b27ba6731159fa795ddebe11f0bd2a212f3887909ca1af61d3d79fa55d3546ea31a5ced529a4558ea071d6fad3739270fcc4111282d7801ce59207fe5478b9
 AUX spacenavd-0.7-no-x11.patch 566 BLAKE2B a70e491277adce00ba0c42b088957a151bc5133abf75b52ed8c215eca5773b7ecdbe4ca8c0f17061b5e31b86066a75eb4e351aa84b43d23a9da9835736547eef SHA512 3ab741b594c5922221a34f4091665429da4735b0678c16ebc0d183c6317e1ee804e2b152e26042cb4981ff5487a49e283ce77c9a0232a13e38c87bb478f960a9
+AUX spacenavd-0.7.1-no-x11.patch 1178 BLAKE2B 79ecf2242c2fa28165f90954c1ae637aa46a95a15d1abe4bda2e999b50ef189c30a8db55c6a9aab4da1667bccf45df0302b204cf4ed16ed82bcf3c2ce69dc5a1 SHA512 19ebad0226fc95aa652afc977d8305cf4a2fa43f7c20a6d461b0f39d3cf307af2819042520f858a585deb407ba962d2758cb5c7ac9ec84b889febd9579ff443c
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
@@ -15,6 +16,6 @@ DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
 EBUILD spacenavd-0.6.ebuild 2357 BLAKE2B 7a42f3a0eddefebbf75a7a47b0ac13406ccfaaa6844478406261c70711237aa6606851cc74945547e808de2a3aa365040a848e4108869f603592da4be4ca7e07 SHA512 bd51d709b6d94a760b934e67dba6561fca07981035e537b0395457e698b3fc4db5381ea337b7b2bb21c2dc9d5ed7e5a249a01cce45ceddb235e481ebb9da750f
-EBUILD spacenavd-0.7.1.ebuild 2235 BLAKE2B 7bcc607477018b73bdf2438619a59ff5ff34e165724b970415a4b3324d1b9ace2fde4139d3c5c8a7fdd00d4ced21ebd43739a1f894b19c2280be3993ab14eff6 SHA512 1e89683c67d8cb0f70419954efdb6b8a1f1b07cfb7de29e3f4302930db8cc5bbb21a8268e6a70ccf04de22a89e33a305ac83da9d1e3d281b6dd901c22ab2e4c8
+EBUILD spacenavd-0.7.1.ebuild 2340 BLAKE2B 8641639a4eaf40702182497356229329a5978f27555625cf22630cae2eb21ad670237336243a36bb92b976bb07f41df1015fb66b2845db3eea27384a533ebac2 SHA512 e0f18a53a8b45e0a2d3a9575d22678ae675010916dbb5308ff2e4650b74f43d2420637f650d03f4b501d5b87122ff345170eaa2b775aad96dcaa111af0c36eeb
 EBUILD spacenavd-0.7.ebuild 2369 BLAKE2B f31dab2abf32e04436ca549895d26b48acc88da8f9fd62ea16bf6643f3579ebc4bd2bbd323fb4b7a3e586a7e6538612d954fb78de69f3b8fb926085372645299 SHA512 c6bd1eaa8dab75618417a7026c11a5f6d2a4982488ac484a266f07a14ad0941a0133bd428c8324181fe1eeb5f1e05dba9443734bfa58808ff47c8641033eb9c2
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch
new file mode 100644
index 000000000000..71b9e26cd038
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7.1-no-x11.patch
@@ -0,0 +1,36 @@
+From 0e7ee937e01b764a6bde28875a3bf0169dbfafa6 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 8 Feb 2020 05:23:02 +0200
+Subject: [PATCH] dev.c should conditionally include proto_x11.h, only if
+ USE_X11 is defined. Closes github bug #22.
+
+---
+ src/dev.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/dev.c b/src/dev.c
+index 2074895..8a1b315 100644
+--- a/src/dev.c
++++ b/src/dev.c
+@@ -1,6 +1,6 @@
+ /*
+ spacenavd - a free software replacement driver for 6dof space-mice.
+-Copyright (C) 2007-2019 John Tsiombikas <nuclear@member.fsf.org>
++Copyright (C) 2007-2020 John Tsiombikas <nuclear@member.fsf.org>
+ 
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -25,7 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "dev_serial.h"
+ #include "event.h" /* remove pending events upon device removal */
+ #include "spnavd.h"
++
++#ifdef USE_X11
+ #include "proto_x11.h"
++#endif
+ 
+ static struct device *add_device(void);
+ static struct device *dev_path_in_use(char const * dev_path);
+-- 
+2.26.1
+
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
index e4ff48d27d98..c36104bb835d 100644
--- a/app-misc/spacenavd/spacenavd-0.7.1.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -14,9 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="X"
 
-RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+RDEPEND="X? (
+		x11-apps/xdpyinfo
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXi
+	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-x11.patch  # bug 717690
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~INPUT_EVDEV"
 	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 5f38451e3289..792f63311975 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,8 +1,10 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
+DIST tmux-3.1.tar.gz 561086 BLAKE2B 8857a788283cee6ac7a63f3241186ba37092729873f2026686d497be3d66ec9650c54d453d8577c195081c2f6c0434e51af686035fd5397ca84ec830347f4a1a SHA512 32f8bc03ee2071449c106f9c895164e8ffbb9cc720607d90e7ef397374c991c571294a918689bd9017ed7045fcff9e36d45ebb4b7454d93836f85bcc0333462b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.9a.ebuild 2300 BLAKE2B 5d753fcb742bc73cf2aa43fa3baee480edd0ce7ce450f03e6cc94c90c887472afa82e04a6885788cf5174372838e6a09e45a7434700b4adc0de102a159d26abb SHA512 170c4737306f8296ef0a66176159b32888e154ad6717e701f309fb31d895154cdf69f3128b199aff78535f022133ba4ade59a5c8194a1c7233fd52f9d52561a3
-EBUILD tmux-3.0a.ebuild 2318 BLAKE2B 08b667153881d780a012b20835340c00720348a1961ba83d396a2b91504e865d27de7cb740f40b16d8c182720c073f39b5fdbeec6cf8111c73aea586bb47eb90 SHA512 f6300ca1171f116e1e4c44a5779528b289fa1b510bf723740ca6da1bb0cfb7e5e1fc293f5d4c7c492435e64b448101bca2221b31663c99a83c39b78a14995a54
-EBUILD tmux-9999.ebuild 2327 BLAKE2B c4bcb63981638dfc026f8058eb94d5c0aed5ca21a3987ed7f1daeadcd3d1dd9250ad22efe438bf93042931de80c6f2a989d7ebd9880716b961f03ded44e02c61 SHA512 0bc8ec9cd27f70235e9f362282d923458734b25546ce2aa494c2a979d626642b8b0be2df8a739e3a1c61988b1379afe070b16e376d9618d41b4feb308b3b3dcf
+EBUILD tmux-2.9a.ebuild 2200 BLAKE2B f6ce1bbb62dcd2881919d6214175c3e416b24015693e1db4af49300709dcc3d0550a53d798e6e2f8757a24061aad4734865c24bbe80f4c3f9ed9009620dc2b12 SHA512 fa607107790ced2bbcf33bef3a08976f1b56a7a7b3a296d0930ecd25786c4cd07e68dcadfe460e227b8c846f85b53a4a6fec9af68c1fdf9da354a47dbe97a8fa
+EBUILD tmux-3.0a.ebuild 2218 BLAKE2B f0b7f6f6fcbba2548ccb42775f35d9f59b2bbb07a1fd004e83383970fadca0ae61859e24d2fcd11de8995dedc4fff2d54dbafa75bdc8d0a30f5572d6ecbaa7db SHA512 e275057fc5ee6f6ac4923b8cf95f7c4c861a2488153efedab6996f6f19b63ab890b58c9db1e403f2bd2893c6e41773413152543567d8c8ffd1d0e5fadd057b0a
+EBUILD tmux-3.1.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
+EBUILD tmux-9999.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index ec46f9d71b89..0db3987a85cf 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig"
diff --git a/app-misc/tmux/tmux-3.0a.ebuild b/app-misc/tmux/tmux-3.0a.ebuild
index 4c2b37a6aab4..11f6e03eece7 100644
--- a/app-misc/tmux/tmux-3.0a.ebuild
+++ b/app-misc/tmux/tmux-3.0a.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/app-misc/tmux/tmux-3.1.ebuild b/app-misc/tmux/tmux-3.1.ebuild
new file mode 100644
index 000000000000..1f43a539b177
--- /dev/null
+++ b/app-misc/tmux/tmux-3.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+DEPEND="
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
+	utempter? ( sys-libs/libutempter )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-flags.patch"
+
+	# upstream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable utempter)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		echo
+	fi
+}
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 9b59adfc622f..1f43a539b177 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -25,10 +25,8 @@ IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 DEPEND="
 	dev-libs/libevent:0=
 	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
+	utempter? ( sys-libs/libutempter )
+"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
index 7823ff065c94..d07924095685 100644
--- a/app-misc/tmux2html/Manifest
+++ b/app-misc/tmux2html/Manifest
@@ -1,3 +1,3 @@
 DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
-EBUILD tmux2html-0.1.11.ebuild 487 BLAKE2B 425bb45c3319df7777b963ad8698f38224c2265454b3f263a7a3fd5b043c1f7574df78278eda82c8a6da9662c54c93ffd59cb9d97d709de3fe1a353785786ff1 SHA512 89d994e6e0a3d973ec7e6ba160223e81907903219d03d9a0982aff9906f75c87955b96dd50400ffd11765513842e4b81cb2cce90e07cf87a136d298c63164fc7
+EBUILD tmux2html-0.1.11.ebuild 497 BLAKE2B f9648ed4eca713e04eb62eef02f13235b1bd1ecb28c311031a3593b5926d0b4b5b3f60ac358938139430f162027f66861558dbb2be380d38a7e707eef093e9f6 SHA512 c28868bd8a067e5b22f1d7aa861ee887eb043688c0e52808ccb4546685c99032ff8608d75f3182c439a5ed20af01e7b318b07b5877a2dde8bd2f330d377d5627
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux2html/tmux2html-0.1.11.ebuild b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
index 3cd5bc249389..88046de7392d 100644
--- a/app-misc/tmux2html/tmux2html-0.1.11.ebuild
+++ b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 97fb4e0a9670..033c08b25863 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,5 +1,5 @@
 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 4687 BLAKE2B 1c7ee9e246f29b54aa4744ef42dbb62ae50aac309306ab304472eaced129db8559c521eb35d6520bb25aeb7e5f43515264c64131ce8d9f5c2ad075973497a6f6 SHA512 493c0c9134ab39df3d3a7b91691a9198b8236af24f6f4130e58dabcf8e9694f06e9bae1ee4330bfc1c31cea9bcc7cdad0fca673c4ea9dc460c692d6b3c4011ac
-EBUILD tracker-miners-2.3.3.ebuild 4678 BLAKE2B 80681eafc12694db0e94afa292064f2d55ed737faf146942eda4d0fdcdc28c14a39d71fa7914d6c82bac39e885ae2419f155b1bbafe4fb0770e297f02a9bf179 SHA512 ded0d5a9f0f5e5f8628e70bb5f819b7c1a76126e9a96085a0769474212c6613e4d74d1b32965e0ebe297dadd74375a60cbb24176f99caa24775c7af3bfd07727
+EBUILD tracker-miners-2.3.3.ebuild 4676 BLAKE2B 6297f5fe78b5f06bc893adf0937372582823341dfae3734a577e9b935be38a25efc2727138ae3543210315f5bdec77375c130655032affb0f4ff1d2fdf88a610 SHA512 e919cdae5cc27230a6c0c8ce5634211f084d4a1c099c43662b8cf1908d79e49687982a6394a71b22c8f724a204feeb45fd88bd35ae6c52a38847723b081249c9
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
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 4870ff881bec..3fd285890588 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 libav +pdf +playlist ra
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
 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 d20b465f39e5..e02e742cb4d5 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,5 @@
 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 2595 BLAKE2B 4b241983c1284eefdc4c7c44749927389959d0b789a970b23d59adccc0ba315d2c0f2b460eb6ac761cdac70a7f0557867da1108605e978780e256c688a868c3e SHA512 11dec80a2cf4c148683ffc6dc6659354d367915d029c83992ef6a694751a24a9b0414ef3125f1369b15932dbc773891dc3b54e1e4bd99a0074035faab6ae391e
+EBUILD tracker-2.3.4.ebuild 2593 BLAKE2B fe6f7e43678ae5e7e08cdfc418c4b93bec966f875e07dc498f8c202eb09824ea336d8135f1188f78019cbc089acf0533e5f05dfb64bf8aa84240bbd6c79e2ac7 SHA512 7b87843b7b980a3d5f4424d03c0198d17b57dbac7c0482640f044f3786f94064f16f8d01aa5093cec46da7d638760367dac3e4c955092d8308b2e7cd58f487b4
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index c5a3577c1c9e..49070be66e48 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/workrave/Manifest b/app-misc/workrave/Manifest
index 3d818334119c..ee359d71a162 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2792 BLAKE2B 38a746dc8ade6376cb0c8f15c737a6126ce1da27e141e1fe471f9831f4b8449d615756ad7df4534f93c2536afd353dbae0acd23985102c044b75161441ecfb53 SHA512 543b2237e60650ef24ca5531a9899e09568f8fb2493cf9ea4ff9ea6d5d514e81b76d1326c65e66b6523dd9c0c4ad0951885a9d3c3f876d65fdec42d4a420402f
+EBUILD workrave-1.10.20.ebuild 2833 BLAKE2B a21f3d65c5d9995d9f2700eab180797715e0bd0f890f3c00b3fe328ef45f80997b6bc69ed3e0e65503bb01445947c4940e00788e7cf8d5d40d2a3e49e86c2409 SHA512 c8f646a4dda1ccf9c127f1ffd1c450204ebecbf2f88face28bb2cf661078b8a8d057eb11ea5251a2f4789388e9af3fd4ce51486861932fa082d34155a6c42ffc
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index a05c5f7aaf93..a59057629c07 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
@@ -16,9 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 # dbus support looks to be used only for trying to use panel applets on gnome3!
-IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
+IUSE="appindicator doc gnome gstreamer introspection mate nls pulseaudio test xfce"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="appindicator? ( introspection ) ${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	>=dev-libs/glib-2.28.0:2
@@ -26,7 +27,7 @@ RDEPEND="
 	>=dev-cpp/gtkmm-3.18.0:3.0
 	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/libsigc++-2.2.4.2:2
-	ayatana? (
+	appindicator? (
 		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
 		>=dev-libs/libindicator-0.4:3 )
 	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
@@ -93,7 +94,7 @@ src_configure() {
 		--disable-gnome2 \
 		--disable-static \
 		--disable-xml \
-		$(use_enable ayatana indicator) \
+		$(use_enable appindicator indicator) \
 		$(use_enable doc manual) \
 		$(use_enable gnome gnome3) \
 		$(use_enable gstreamer) \
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index b05b1b034f1b..09c084429f10 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,11 +1,4 @@
-AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe12ebf96e49cf28018e51e6c4c31cab0b8e18af60ffbb814c747de2293b3c270dacb03d556bdfb6a2a1c3752f SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a
 AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
-DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
-DIST ytree-2.00.tar.gz 124654 BLAKE2B db55a463c3103a544ce882da9e5297a9bde3d6e5b618332cf863dec87e6d1842197c5f6ae282e05d4a0674a8c8d52807f9eb2c163e87c1adf0b8c484e1874d62 SHA512 4306ac6f46187dafd48103348fc30cafd8cec50a196a526249c15528604ad635b0bbf96897fedcb69360b43000d0447698523168589aa917a5884252fa183529
-DIST ytree-2.01.tar.gz 124683 BLAKE2B b6ee398b21f22ded23d4cba03ab50fa45113f57341029db1bbba2bafdf286f77191904e9d785b1009d57d79d58d82dafebd4bf75753f0724c855f3410e867299 SHA512 2a3ee821462f5aec21aeb613b336831b1f94a5595a3aefc718b4e7516471f43db85e8e430f2d9593d199f455719bacb7ee19e3419806a599354c29ff49d71ae6
 DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
-EBUILD ytree-1.99_p2.ebuild 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
-EBUILD ytree-2.00.ebuild 617 BLAKE2B 656e5b1c91754b3bd8ef7623f00396e5c084f5d48f2330536c95cc4fe8a1f53dfe7f7b9322d2d7aaab6e9d10d464509e3df229b1aef0d469ac43050de376e29e SHA512 f98140497eacb460b43ed9d9c0c55ebca2500552fd7203504cd703d47f1ac873891abb82fe03039210e06040bd165f6214bdeeed1be112ad95b9c161190ac2b4
-EBUILD ytree-2.01.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
-EBUILD ytree-2.02.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
+EBUILD ytree-2.02.ebuild 615 BLAKE2B eba52702d30fd8e1c829771d8edf8d3c9e522d93d0e46378fc9ea5e4c8f010f03d2a789c349e95d941a6d0cdb8a61b56177fa00750027a6304872cacc30a9b33 SHA512 118e154f6fe99ee6c95ea84c704881faf497da262b62f3dc69a3476c3fc1095c548af5a3b25ec6bd9c75b044e017a76775f6a9e89c6fb36f87dea1ff566237de
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/files/ytree-1.94-bindir.patch b/app-misc/ytree/files/ytree-1.94-bindir.patch
deleted file mode 100644
index a79904e923b3..000000000000
--- a/app-misc/ytree/files/ytree-1.94-bindir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2010-04-11 17:44:57.511131862 +0200
-+++ ./Makefile	2010-04-11 17:44:14.143178887 +0200
-@@ -225,6 +225,8 @@
- 		$(CC) $(LFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- install:	$(MAIN)
-+		if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
-+		if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
- 		install $(MAIN) $(BINDIR)
- 		gzip -9c ytree.1 > ytree.1.gz
- 		if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz  $(MANDIR)/; fi
diff --git a/app-misc/ytree/ytree-1.99_p2.ebuild b/app-misc/ytree/ytree-1.99_p2.ebuild
deleted file mode 100644
index d4e2e2e040c8..000000000000
--- a/app-misc/ytree/ytree-1.99_p2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-1.99pl2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="http://www.han.de/~werner/ytree.html"
-SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.94-bindir.patch"
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.00.ebuild b/app-misc/ytree/ytree-2.00.ebuild
deleted file mode 100644
index b914efb10d8a..000000000000
--- a/app-misc/ytree/ytree-2.00.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.01.ebuild b/app-misc/ytree/ytree-2.01.ebuild
deleted file mode 100644
index 3a14d3abcd18..000000000000
--- a/app-misc/ytree/ytree-2.01.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.02.ebuild b/app-misc/ytree/ytree-2.02.ebuild
index 3a14d3abcd18..a3a24fd384af 100644
--- a/app-misc/ytree/ytree-2.02.ebuild
+++ b/app-misc/ytree/ytree-2.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 7ccb8335295d..74b567b48a86 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 628 BLAKE2B 6eb621533d02bf8155aeb742d4ca865d815df297333a20ea4bb4e3a1c926aeb63cea97aae35e8bdb1b1029f13d736073a8f40baa2958c64d5ec7b45ec61651d2 SHA512 7e7f0c3de9e9f2d988d00374361040e627ad824fee684dbb25e007e9639c018cd0bfb44780f2f4be1ee524f3b5eb682ff4e8cc52135923610957cf7999649763
+EBUILD zisofs-tools-1.0.8.ebuild 629 BLAKE2B f8cf03751ac5c0782381af9390c3dff7996b16155488c103e5df2c371012788511c897b27e9ff6b682c024e631f839b0e0c0565eef3cc9116a529d296b81a7e7 SHA512 41f158d4250f7dd1e1f35c820a253499ebdcf72eac247cd70484e504713175cd2089c5d0e5eedf178be8ec1b750ec5fffb316087c7f73a6cce5dff4f964019ba
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 216503f89eb4..800d24e2f3a0 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -10,7 +10,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
commit	be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree	f82923fbca262493e83dd1382e561a2fae24cc46 /app-misc
parent	7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent	6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)