gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /app-misc
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
130 files changed, 814 insertions, 1369 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0da9c266ae79..76e896cae183 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 26c2ba250916..8b1f92056bd6 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,6 +1,6 @@
 AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
 DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
 DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
-EBUILD banner-1.3.3.ebuild 492 BLAKE2B 3bc39ee1df2bf845a929f6ed8c1d1f1841dd02e7ae12a64477c9c3035d572008e61732a5ca8815aaabf9f29ca796ea168ed81cf5467aa24c4d1e91df4d0a9891 SHA512 b25184eae18eb9918ad8873d38a5002d2cf7e9fdaebd1439a6d18014aede27ee87a3598d0a7e5a8a881d437de476f45b4f739013d949d59129b4d54ab476a4f2
-EBUILD banner-1.3.4.ebuild 459 BLAKE2B 2b434dacf121b47770712f14eb8863fcbba3d2d7b699c085648c4c72cd27471531e72595bd7b68e14ed8d46fac50b32f4a1ef6a530795b86cb1f0124a7d09e82 SHA512 5ef0de83a0a226ce301b695961388a535967dd62fa97e901aedb659407d00b1cc2b0d9a818a8939da80d791bc292c680f92978f22290a214d5d61d1523a6175f
+EBUILD banner-1.3.3.ebuild 482 BLAKE2B 32e35eea88537f8debc7d9da68315444f2574ece0057444fd552fc9ff4712b82634f56b8f1c2b22380bcea80ab680e9339b890d024717b695586ef78e33bb355 SHA512 5a472bad37e23953e956c2cee7e2bb927d031dfd09101f651c9e73b912ef3277db1eb917c2ded63b6f1610814e5b7da15d12189509fda3910063d263119312d3
+EBUILD banner-1.3.4.ebuild 449 BLAKE2B a3acb21e40fe10d1ef42b8b80e1130fb3527d2046df38de755ee015838f67c714ff688591620e51779d2920cfa84a23fd62ac3624c7958b48a9d259e296f14d5 SHA512 d5c842567cbf1c9c71b9328c3c2ff81bfa4237b8cb700a94e500a051c0ed4f5a382be201384dd15058452e25a0074a17758ff69a3dbc67f2f8b77e088cb2228d
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.3.ebuild b/app-misc/banner/banner-1.3.3.ebuild
index 827111bf412c..952e978f5c03 100644
--- a/app-misc/banner/banner-1.3.3.ebuild
+++ b/app-misc/banner/banner-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="!games-misc/bsd-games"
 
diff --git a/app-misc/banner/banner-1.3.4.ebuild b/app-misc/banner/banner-1.3.4.ebuild
index 43101c37386b..86982445e08b 100644
--- a/app-misc/banner/banner-1.3.4.ebuild
+++ b/app-misc/banner/banner-1.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}ftp/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!games-misc/bsd-games"
 PATCHES=(
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 281f83895038..7c4afce4c8f0 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -3,5 +3,5 @@ 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
-EBUILD beanstalkd-1.10.ebuild 1062 BLAKE2B 0e81ee56bb61a007986c12af4733891272807ac362c772adf7e8c0d4c1385e4f098cf3a93d1b4c8068d8f645c79db3a5fc2668f54b07e831fc14260175b7058d SHA512 0799c734bd5eeeb4d8dd171c65f2c1aefb6cfeb43513e11a5d5d2ccc8dc1a40785af1baab54314ad8564236580aaa721446d1c4f17dc94c4cd48630a001e59ed
+EBUILD beanstalkd-1.10.ebuild 1052 BLAKE2B a33b258f2ba61e14b97c91a7bdb1ba086fcef9863c698e72fb32ce13fd04e6a39b54dd96be74f20bd8fcd3c7d1b559978a3d388a2e16d8e890c883208e6c31f5 SHA512 40275b672b14f144421067d42ed765ce76b03876f648a34c138bbefd983ae397936d256b0f1c413baebe65cc91324f4650e6b405ac4d4158bf1874676c3fdc2b
 MISC metadata.xml 436 BLAKE2B 72356d3a95f45dc54e13946b8d41e698b60d44205e9ec90cee10d916f71ed0e6ed2a81929cbc705c8eeae00587790b2c4d2439a0ca366f28cf123ddcf3137f38 SHA512 7766293e42fb4786e971b259480f4e697745d23db9b332e24c7edda52d8ccbc2ebdb1ed1b1c9265f22d9ec698fc144acd6e7576cef66f3a33db8a4f102b08140
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
index f49d66ec2e70..83319c020748 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos ~x86-macos"
 
 RDEPEND=""
 DEPEND=""
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index d83398a61a0a..19245e894301 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,7 +1,9 @@
 DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c3b21dd38bb8c9319857ead9c5bd1b5cfa01bfa190ad6fe0f5a99007ac68d068ec6082bc1fcf32c667d6035f1e296 SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059
 DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
 DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
+DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b93323e6f422067a4be0dfe28ee8332db481d99bb1000aa48d384efca33f76e5e42d7d1b795f527e95a17119936966cc SHA512 a555e2084863ac604c3a511e11339a65059058af454eeeeb24993c5e432b42527382d3b1d308996a732e190157dbc6f003d11bd5a611cd59799fdfbb3f9a5fe4
 EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
 EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
 EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
+EBUILD byobu-5.129.ebuild 957 BLAKE2B 07981598d2b0694ab5347e790554728f7e9eed24bd34c3ec6c87842d0456aba8613aecfd45d1dba29bb1f45882844c19b955699d3b666840fa9ca77131c0cc28 SHA512 abd87bd8a729334318fa9d79682c681a6add8f3cee5f10b2b13b040260f8ea023097de432a43bc7dc6c261c59aa2fbd8d51854b6ad698015c6af4005a87fa1bd
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
new file mode 100644
index 000000000000..2284610ea606
--- /dev/null
+++ b/app-misc/byobu/byobu-5.129.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 4118936fef20..5410ffd8a91e 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 1014 BLAKE2B 13e3af4f1cc61537218ef8daa943b0fc0fa053d89d6b535c78853c004891fedf87243f15b567c26c7dafc674f7192fdf98e76a119a83971346d9eb93b4349374 SHA512 797258af979572fd01eed64c05bf66911029827a5525a04e92bf7d843466e683e001dee458f5b08bf09c4267a8f67bd91d8ae51ab4dfa68a871b7284e282a0ae
-EBUILD c_rehash-1.7-r1.ebuild 1021 BLAKE2B ffc5eda81c26022ed8cc0980c8efc43a7d4bede657cb9b85d3b7a7ea5a8f2b7809904ec6d2f513659a41e3d717c3c1e7e4c0d88a82635e42a503926674d10b0e SHA512 727b09a5a6cca0ffedabb68a8d7a89c89c4cd63364f70aeb75ce74398a50fecfd6d721c235ba27984cec63d4d955477450ed6301e6ecd23a8cbdec0ddfaf2647
+EBUILD c_rehash-1.0.2g_p8.ebuild 992 BLAKE2B 842e588cd44c38a14b7e6a1530f00734b0b3c43bfc98ed5d668f5f323a13a133c4b8cf40b9707521a411dd1b4446a1483330833cf83d250248d5364c90726ff1 SHA512 db7aa21b7637ec97ed37b7ae14ebe841afd913d1b4c27834e1199790ff1db0f64837b37ea50aa869e842a76881450076e557d04c8b9837723df1c18f48e2e117
+EBUILD c_rehash-1.7-r1.ebuild 999 BLAKE2B d771d9b95e422b3575571beca73db431835fb497da6678360a7586b929f2df252302bcd390b6d6c0a70e57366d2d231b9869ac22c312d3254efa148d215cdb05 SHA512 eab8391739cbc0e26b66c7442ae4b9beb4d16c8fd9d51adebcc1caae04a2aa16d87265f427df83fe983f1b1e8022035ba040ee2260ad5b2481ea71a3e77458bc
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
index c01875e8625a..c88fab854424 100644
--- a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="libressl"
 
 RDEPEND="
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 a5bcb89906e2..c486487cf562 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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 53003c2571db..4b61ac4becc2 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 5801 BLAKE2B d9a1fd8cb67217cf94907d09487c5cc8a7dd38937d730941ece8a1696a0b4e9a48e3a376120a63fbbbe8699529f85ebf256fb81f2b71f4bf9874336f3b1108cd SHA512 4e725eef53be374b30be3e6c00e6b91a4d4b7879689c08d3aa6ec8c9f622e5e84674915661fd72f7559d4d8d6085d8913b1c4caf077fdc1cb914ad63309fd2f7
+EBUILD ca-certificates-20190110.3.43.ebuild 5779 BLAKE2B 5b811fbfd9467e17c057f395245290db3dfb34cce16664df4d4a8f9c33f04e0435f67c917381a0c77c744e1284db22e304811732f9524b573f476ea2c9125181 SHA512 d367423cefbfa4b12ef0de708feba36e9d9b984aacdee2ffaae50347097b442a2e06d2ff2627d2ad3aab6fa3c613edfd4a0b50fa48de6a984e5173be1ef52822
 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 ef37fa527af2..d08a568b2e9d 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 6c931a632b88..c18a840d8c96 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,3 +1,3 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
-EBUILD colordiff-1.0.18.ebuild 947 BLAKE2B 79867fdd66e1e1f07afe1aa61d1608ece43c3e47716cb2a2c957d3aaace77478f6fb0b189cbc81c0466f6a92c3cf6ddd20ffd64ef8440205764dc87813614409 SHA512 f043511ece20f661ad4021231530317fc6f058421d8e809e54037bad0a5b8dffcda88f3d10a6bdecf42761eaaeb01faa9fca054a2f525c4d53c71aeb9cc22ec2
+EBUILD colordiff-1.0.18.ebuild 937 BLAKE2B 4f762041454b318234c1fbfb1151ae1f3d7939492d39eef29a927126efe91f1765d5a631c9f2ace758cc5851eb8329bc2394ed82d6720c5ec1fa9ebe1e39ab8d SHA512 910af57272ac2fd46b90ce729abde5c8b81c418f74982bd700e9f1874fd39db252587199ed80b8e0e7dba70b63736f72f13b0451615672ffe8741190f17482bf
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index c09e21e5b17f..4b975fa07313 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
index 673d0dc61e39..4e6bd8082b98 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,3 @@
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 659 BLAKE2B c79449c6313e63e2ecf9cc00834750bcffe67811fdc1d13dd003ed3fa66f4dfb3b0c564b6eb7616754f60f7c0c9533ad90113b1d09df0a3099d9e8527e8f1ee8 SHA512 73f526e020ce899e19699e5fd6cf6bcbfeba343f37f5b203dfc1488eb711941f492cb5ff16bdd14a974d34dd5893d0f89690928aeaf98e7289fc00d376d5807a
+EBUILD cpipe-3.0.3.ebuild 647 BLAKE2B ac1ec87df8e08fe380648f6ff9afa17621c0570a6fc7c72e9188c701411459a0e3105b66e7a6f39bc1857de6dab0f37cb56147a7f6b10416416181402a5cef6f SHA512 cf4684cfedc4445345cba50a5875d5f67b2b5492de99b527b4af461c8ab289e64098a56684b20fb483236d0cd1c8f11c8a23db8f0ede560cf56c624da1486468
 MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
index e37354a3d76f..6c512482572b 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/HaraldKi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86"
 
 src_prepare()	{
 	default
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 8a88f1496595..3fd8a18790c8 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -2,6 +2,6 @@ AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
-EBUILD datefudge-1.17.ebuild 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
-EBUILD datefudge-1.22.ebuild 1011 BLAKE2B 4054e31fb2d326c829659adce961be253c41c39c835e12dc6f5073e0fa8664f1738479dddbae7dc4ea3674068f170a20459c086ceb6e55b38ec5b308ba274cfc SHA512 bb12d1583f021703bf2f7567808c72c92124788751bd12fff40613dca2bec9964a717dc4188cc78d86254bfcd383fe3e9b194e89d11ef3c6da8ef124588dfb67
+EBUILD datefudge-1.17.ebuild 950 BLAKE2B 82720a9c28feb654e55136aa0c1b31aa35e4e67363c7502bd1baedb544c9f51974784a0071b438b930ac35a5747d052809d6e47602f4f6b074e6436289e69d33 SHA512 269894aa7d6226bf88c25b5b38c9e1283ecea5fe2ca2850ecc848eafd16c653d7f7dedd4d81b777ede2e7b03394834e0c8233939ac3e02fa9d0c5e8a216b3096
+EBUILD datefudge-1.22.ebuild 989 BLAKE2B a633a3ec1d41f01f70f6c306b6553e63e5357514333072075a83e8b121f11b9a21c8a08c164b1575f1c4654d9db66b3da3464c4d122c19bb0384048c0daf9811 SHA512 23ad20ee114e5089efe10a8c4735ad5695ab12d99965dcfc4d9e219fb342aaf04d416f93bd7c33742aa7d277b091a0c8222f486e2bb584f5f2a08c0c2d340063
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
index d26c1c7f125a..aceea09a64c3 100644
--- a/app-misc/datefudge/datefudge-1.17.ebuild
+++ b/app-misc/datefudge/datefudge-1.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index 82e8be0176c4..e3ffe7c750c1 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh ~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 26a9589b6270..ae5720c29c83 100644
--- a/app-misc/dfshow/Manifest
+++ b/app-misc/dfshow/Manifest
@@ -1,3 +1,5 @@
 DIST dfshow-0.8.0_beta.tar.gz 97301 BLAKE2B fa98ef37d23ef39e8512eed410d4a3a9e45aee87d9ee1c35230a9bea47af61c936091117c7232c195cd661ba61b09376ba1db4167bf8388323311f2a2fa7b6a6 SHA512 79cd82916521500d5f6f7ab00770af084f1a52069fe5625b7336f3081084ece6d2773be7f5480c444455ad3151e603d937b3feb279a18502c435c1a05d6d1446
+DIST dfshow-0.8.2_beta.tar.gz 97733 BLAKE2B 99790b6901760a5e4adc7942fa84d11fb9d5e2f4e60a5d4abc2ce8fed0e86ab5f3def67c2f567b1ca54f1ecdbbe04522d4a75d69694b0ad213a69d86d49514e4 SHA512 1fca7f72c0200df13ac6e640314f9ad94ea3b88eb62a18a606f3a06a02252107f59747fbd404891fff5898b3796650023827ca59ceb690a0aa45e3c0a8bca749
 EBUILD dfshow-0.8.0_beta.ebuild 734 BLAKE2B 94dba6b5ffbef8e703a05a16f6f61ae7e64f64771e5dc5cbe62c4d61eab9af8e2123c94c6184c5e9d88a8b18cee4a836ac3c52168a9a262077b8702f0353f32d SHA512 10bb9a6127c6727e79cca0abc5c1d15da27a7f9dcc568091ef5c06f224864b4c7b6e6a8fece758a4fc6a7d4aeab6e6961bdb795fbbb19674934d3ff61a26e72c
+EBUILD dfshow-0.8.2_beta.ebuild 737 BLAKE2B d172580efe123e969118b89e31c235f244a7767e2500555b6ef08fbf47675e6f4396d8b0d0eff11d8eb6f91c29bda3e4d73fd047abb5ee2abb1b7d51c2f5c56f SHA512 9b3f8bebdf15d474dc0fe8baceaac97af80f4e54cd8a77ae12480f774d5e8aaaed038a8b4a8e3393545173cd0dd58589fbf8d63745f52c4fe69ff7ba39424fe7
 MISC metadata.xml 637 BLAKE2B 30ff2ed55699e7482978875ab5af6058eb9ba91ff46756df7a2b6fcdf93f01026c87c61ed3ab1cbf2ceea9fbcb9e85730457bdcb93bd8f6461e869fc55398a82 SHA512 ca6da84af5bdf429ca98077e5656a4704771d11b9e0b13aeade9d0fc375634f4c50a94c57bf8866ded03c19cd99b7866f48b26fb1c271847816812b758fc6eea
diff --git a/app-misc/dfshow/dfshow-0.8.2_beta.ebuild b/app-misc/dfshow/dfshow-0.8.2_beta.ebuild
new file mode 100644
index 000000000000..2b75216f7b96
--- /dev/null
+++ b/app-misc/dfshow/dfshow-0.8.2_beta.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV="${PV//_beta/-beta}"
+
+DESCRIPTION="DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT"
+HOMEPAGE="https://github.com/roberthawdon/dfshow"
+SRC_URI="https://github.com/roberthawdon/dfshow/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libconfig
+	sys-libs/ncurses:0=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/LDADD = -lncursesw -lm -lconfig/LDADD = -lncursesw -lm -lconfig -ltinfow/' Makefile.am ||
+		die "sed in Makefile.am failed"
+	eautoreconf
+	eautomake --add-missing
+}
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index cf61e68f4ecc..7b92f9bd06d8 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 467 BLAKE2B 3048c246e47ee8949f6f27a45e3a31f6147993477c138d2a55168a63dc6a0240ff0ec63d214ee127f7d3cbb15823c727442b0708c20fa8c59b7838abcd022a8a SHA512 c4adf975ca5437e51b7a2f068283b0a2684df3350aabe8ef451b691f0245e96b0654249ebd88d4212fe598177d30ca7c87fe1cbf956c750ed53a390bd96ff295
+EBUILD dtach-0.9.ebuild 455 BLAKE2B a9cc8ac912ea0839916c82b2d2424857374b8cf18a427ec649a90594372ababba6675150c03aa842f30f12a0efa906e38c3447066e45a35a1e4ac7224943d8a7 SHA512 081db08009360a8eb87875f122a849ed89115ccd90d0444a55ae9f54688c79f13a54f79d7dbc74ac8e890301e0116a8d50a71d1e8ef4bea2fd38520e5cd527ab
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 44924a0b86b3..fde18e156228 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index f4e58205f277..9d3bf9cdd3ff 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 887 BLAKE2B 36cb980bef87a67f3b5878e0ba418b6dd0cc53ca5636745b3590e69c210d47ec6492bd93f2a555d05b03a179264105afa987954b1f14041995cd7b9b7fa1e800 SHA512 43e852ed1b5fa58ec08024c7a162ca9812eee9a9d6ddc2938738c72ecb659b79f74e4c52665cf082f2871dca538ea99e989aef2eb16ab20fddb741f7b08e67ed
+EBUILD editor-wrapper-4-r1.ebuild 865 BLAKE2B 87a3b158cd13c0430602657c4dc6ded9e3a24678e9d5fcb5cc4f4b662ed9c75770f5860653ed1967837e4f0dfaedb430d4463a31c449f1e0785f234a25b2b156 SHA512 2b503f30c0cc23418b388e5f8449af4aa71ab24cd4a03dd4db2dbc372ab490e36e8c1a91b3632cfdcf3029539ca3f07672b760e315db05783ad142f78967c43b
 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 361c762024fa..2b944870d40f 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index 529c00a362ef..8c06291f577f 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,3 @@
 DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b
-EBUILD egads-0.9.5-r1.ebuild 1013 BLAKE2B 8f27b783b53c6082b6d18e7a276042761f6a549eba2e3a626c2f1867d2cef7c2216342152acd6f108c3858ebe8c7b27dd28db372335793dcfe674d54a2cf058c SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3
-EBUILD egads-0.9.5.ebuild 1053 BLAKE2B 7a5adc5173ea61428091aeb001df7304b741c102c08f4c1982c23eccfa2ac7225048fbdf4a07819299fff53670237e1d93bdf98bbb86496efe0318e0397e637c SHA512 50c4e616310d2e2c8004c71d303a4b4d3902038fa42d42479111af1e70a8decd0ed54b05e78105a0219f3f00f7904dfc32b86d7aec4aa3a3edeff540c3396f18
+EBUILD egads-0.9.5-r1.ebuild 1009 BLAKE2B 2d9bead82f24e25080bf1d60ed49cca975d0e70d3fece86ba366885be2936115a8bc34c89091ae87231edb964e09b4c6e8a9227586204466f34ca6dd20dc2d3b SHA512 ce40d6f21d82b6a7788653d44bf059de43d7052b08947480a4ec3416ae8bb9f12b08ef3d61cce133b7653bb1010823d4fd012c057c21a4445c09d832f7db1248
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-misc/egads/egads-0.9.5-r1.ebuild b/app-misc/egads/egads-0.9.5-r1.ebuild
index 47f7d23b3a5e..415f97ec2038 100644
--- a/app-misc/egads/egads-0.9.5-r1.ebuild
+++ b/app-misc/egads/egads-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 EGADS_DATADIR=/var/run/egads
 
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
deleted file mode 100644
index e6296724932f..000000000000
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Entropy Gathering And Distribution System"
-HOMEPAGE="http://www.securesoftware.com/download_${PN}.htm"
-SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-egadsdatadir=/var/run/egads
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e '/^BINDIR/d' \
-		-e '/^LIBDIR/d' \
-		-e '/^INCLUDEDIR/d' \
-		"${S}"/Makefile.in || die "Failed to fix Makefile.in"
-	tc-export CC AR RANLIB
-}
-
-src_compile() {
-	econf \
-		--with-egads-datadir="${egadsdatadir}" \
-		--with-bindir=/usr/sbin \
-		|| die
-	emake LIBDIR="/usr/$(get_libdir)" || die
-}
-
-src_install() {
-	keepdir ${egadsdatadir}
-	fperms +t ${egadsdatadir}
-	# NOT parallel safe, and no DESTDIR support
-	emake -j1 install \
-		BINDIR="${D}"/usr/sbin \
-		LIBDIR="${D}"/usr/$(get_libdir) \
-		INCLUDEDIR="${D}"/usr/include \
-		|| die
-	dodoc README* doc/*.txt
-	dohtml doc/*.html
-}
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 109afd75a908..baae31608c58 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,5 +3,6 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
+EBUILD fhem-5.9-r1.ebuild 2319 BLAKE2B bc4f2e8a158ffd94e91e3c46f5996c65aad88822eb85fc0eb24ed26d876cc68293fd69f63191d5cab4b91dcc150f820b0ac7efe97b7eff22855c939755f47112 SHA512 e2f158ca9cca738c2ca33717b5796405749691b86092fef50d2fc36dce047cb9e3f19e4d48162c0912ca9f4262f0b66613ac1a9fa7dfe14615b634f1f0c60957
 EBUILD fhem-5.9.ebuild 2357 BLAKE2B 34b77071183e346285896e9f608c364939d8b1056fbb295af41998057d45d998e10c55dfb39746510e85cf3a2901d1f628033ca4f0f4b6567dfe50b2f0ba712a SHA512 b365555c87e53a4370e655dc37e3e590a7ef7a72aa239aa4b243b6c193d2823e49cb2e5976d8109949e781a420316e528e1efc2412a7703e394de7c08d9c9493
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9-r1.ebuild b/app-misc/fhem/fhem-5.9-r1.ebuild
new file mode 100644
index 000000000000..7d804c1d86e6
--- /dev/null
+++ b/app-misc/fhem/fhem-5.9-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	acct-group/fhem
+	acct-user/fhem
+	dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON
+"
+
+DEPEND="media-gfx/pngcrush"
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
+	rm -r contrib/lcd4linux || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"MAINTAINER.txt"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+	diropts
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	systemd_dounit "${FILESDIR}"/fhem.service
+	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index 186b776836a6..d6a3cbf2fc85 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,6 +1,6 @@
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 953 BLAKE2B 380ac3d9845a8df779daa44b6f2753105a583b8afdf5426a13d2ccf121dafe1464e50803a1f4eff8028bf7f0e6e93d39f2d43ca53d481fe2553acb34e7ea7450 SHA512 d05d18d1fb99bc3ffff5ec979b34df391e8f1a738d04e35f9dea917bfe37cec94dcfc6d3a8dd3dfcdfffbe4ccf98f5ceb85019754bbef2f93ce9b9add80bd173
-EBUILD figlet-2.2.5.ebuild 944 BLAKE2B 26363338b68fd5119a5c0fe017ec5c2f564dee3bb34294359ba2de4ba9fc955ae30baff45011e818d230e2db3f9c8370fb585852aea02431f92b3c282d856273 SHA512 7b5d84e084d4a2be3ab5410d5fd5a5f8d7045e1309ba79a22891c81dc4b057f5409d667e941c20e2cf14973067d96c99966ad1ec87721c4b950d5047236d01db
+EBUILD figlet-2.2.5-r1.ebuild 943 BLAKE2B 9b276954a7ed1fa392d2d7ec13cc822bab67d289884cfbf170a4ed0a98fa166fee19c6221a683b02c57ec11caea41821487c0b89b5f1804a4fc56eb5f5a5c4cf SHA512 4d6075b0a369bba1e95074fde136be5edd9eb01aa6906ee4385e08b73311315c80c5d24f467bb0783084f12097e4a1ca8be65b183bdb66752ed62642e7d3a104
+EBUILD figlet-2.2.5.ebuild 934 BLAKE2B e5479f3a0e0a066e17cf129646c2c42b3f74b86abece508563c4c49d5ee854a081d3ac5d2e569a01623f5a3939a27df0881c1328df8225d6b6d2b4fd79416e37 SHA512 1c3a768808eb9ad13ae8b107a3e91fdeb4ae0fc8af4472bd7fb29ae7d017d678cf5798e21c2f2807ffb610fc361d1b3cefceefdda4dc9bc05ddd5bdff19ff222
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 5544037f0869..953d8c4cb93e 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 src_compile() {
 	emake clean
diff --git a/app-misc/figlet/figlet-2.2.5.ebuild b/app-misc/figlet/figlet-2.2.5.ebuild
index fe9880b239ed..40441e6e2721 100644
--- a/app-misc/figlet/figlet-2.2.5.ebuild
+++ b/app-misc/figlet/figlet-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 src_compile() {
diff --git a/app-misc/flirc/Manifest b/app-misc/flirc/Manifest
index e3276f573ba2..ea76fa45e86a 100644
--- a/app-misc/flirc/Manifest
+++ b/app-misc/flirc/Manifest
@@ -1,5 +1,9 @@
 DIST flirc-3.22.4_amd64.deb 9013138 BLAKE2B 5624f981fab68d58951d6f0411c059d098d260cf89a98c238b7fed0b7eebc2952d7584bfc9f0a6364757002a565faefbf489c2992031e91177ec8f3bb11979a0 SHA512 ad493a6efa30dcfd6f92dd7176cdd751c1129f669fdbaa4cf06a41447a5e1fc3ebd5d9100f82698ce82592fdd032bce86266489035879edc73f876177531576e
 DIST flirc-3.22.4_arm.deb 10643940 BLAKE2B ace0ecf667e177253a1de50d6c629092ac39ad16c838e5b99006ba39c6bc068ebb1cf624d024e5634d10ae0d03e9bddc5e91357bc0a8fa5eac84eabc28f691f0 SHA512 6767e0e8c7ef1bdc3c1d0b0637bf01816382dac544b2cd7fd344a0ec5e54b0ecd1b2d5a668533f7808b171eacddd54c0fb2463f79acbfdb3dd448fec0e8564ae
 DIST flirc-3.22.4_x86.deb 8989574 BLAKE2B bb1171def52e9171e3f97df7230de1f7bb6e2e571577e45aa9fe88bb11b663c322f90c0e74b4001e792954f8667105401aa0d3a05aa7b49264ea507a76f5c63e SHA512 4b51d0c6f89411ba54f412ac89b82760b8817ad774838de1af467dd0ca6d2ebf567a073d222f8563aedb68755dce53de8bff4a5dfa785d27f3123d206bbf2869
+DIST flirc-3.24.0_amd64.deb 9027598 BLAKE2B 5ab9b0c24eeeace872aa0c022d78afbd19a1edd5b54be26216f4cd1e63f2ecd11b257c53254c76aab0fa96eea57d2a346633c091ba109aa08551a5d6aeae4115 SHA512 12bc6fedc097491cbfa30ca26c0bf3c97a2fdbeb51e2a9ad26d0bf44f9020d2f2becbeaf2d760338894466f5c7f455abb608cdc11cd46893fb4bb79ed1ce7f37
+DIST flirc-3.24.0_arm.deb 8988130 BLAKE2B c201521e8cf4fd1e2dbd5be4eaab30a00660271524d0be9ee58563f60731247ee488721d6c2561cc4bbf24aeef56530ed87be5d83c73696bc2877b1a35e58526 SHA512 b5af7ca16587e6f89ea32b9127ed6f6fb1a4634189a39ca9242a87471efb6f0400a8e9ae2f0652095cc3a92476e419b2df529d938685435ab1f740dfe2621790
+DIST flirc-3.24.0_x86.deb 8992950 BLAKE2B 2435d65371cf4209a16862e2f18b3bfa24af6b1336bae87bf3fc701a764b491551c687602d0ed68834fd7083a8271b234db70003240e23bc970e844383faa92b SHA512 8c9a16c59a88057b90f6f9640c0729e2ed2c862f544cff8e42fcf3a7ee85cd2be4ae1e4b5e76e38d733996b985b01cdae40892f4fa1ddc52fe327a7ef07282c2
 EBUILD flirc-3.22.4.ebuild 1139 BLAKE2B 7c5ea57b5ceb92346c1c137690eccf54d808bbb70c37d9f1b12cecb0ef2e8038db91fdd4addfa149203d229e44d829471b0afb7e08747ea05b1d74de78102c8d SHA512 b54e2a8014bd550a3913c61d1f093d3b9893d29c82cbd774538b7b31be22ca4f3973f34f267b1cc3ba0f023d4f2826728428f6ce6dbd3aa4afd243baa84b0edf
+EBUILD flirc-3.24.0.ebuild 1136 BLAKE2B 7c48b0b65f5643ddcb16b5b5d7898784848d140a82c72abe6d82df0709b56f224a261df49b5d1069642ebf3e540a572bf229c71c8e6e252b0e7a81d89e266b8f SHA512 62717f284bdfa73f2315a3815c12184ccbb91adb13a9b5fcee3d60a97843045de810a2df6e399cf68f430ccf45c27160d9cc0914b9e5d7c0bea7c3a7028fd850
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/app-misc/flirc/flirc-3.24.0.ebuild b/app-misc/flirc/flirc-3.24.0.ebuild
new file mode 100644
index 000000000000..0db412357a0f
--- /dev/null
+++ b/app-misc/flirc/flirc-3.24.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop udev unpacker
+
+DESCRIPTION="Allows you to pair any remote control with your computer or media center"
+HOMEPAGE="https://flirc.tv/"
+SRC_URI="
+	amd64? ( https://apt.fury.io/flirc/${P}-amd64 -> ${P}_amd64.deb )
+	arm? ( https://apt.fury.io/flirc/${P}-armhf -> ${P}_arm.deb )
+	x86? ( https://apt.fury.io/flirc/${P}-i386  -> ${P}_x86.deb )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+IUSE="+qt5"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+DEPEND=""
+RDEPEND="virtual/libusb:1
+	dev-libs/hidapi
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)"
+
+QA_PREBUILT="/usr/bin/*"
+
+src_install () {
+	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
+	dobin usr/bin/flirc_util
+	doman usr/share/doc/flirc/flirc_util.1
+	if use qt5 ; then
+		dobin usr/bin/Flirc
+		doman usr/share/doc/flirc/Flirc.1
+		doicon usr/share/pixmaps/Flirc.png
+		domenu usr/share/applications/Flirc.desktop
+	fi
+}
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 850f24bf467c..33165d3dabad 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -2,6 +2,6 @@ AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452b
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
-EBUILD geoclue-2.4.13.ebuild 1676 BLAKE2B f4cddd032f3d5f3503e9e1e729faca949544f7a094cd9ff2d52b1bfc47a90cc85116b6cd5a590851a7ed31afbb29dccf5733bc58288616d10f69db90a058d1d7 SHA512 902a1922ce0ad6c3e9ebd0bd1d034605de6652c8d9ac40271d6593f5cf9af2db8c41a3901e31d5d56f2857446126fd46fc0fb06fc04d644221d6afce46dd3d97
-EBUILD geoclue-2.5.3-r2.ebuild 1754 BLAKE2B 5ced054846276c106c2c4dda63747beacd29a8fdcabd4366f7361341a438c8028521f67568335b28c77027b7e8cf44e99bcf5cb8972b494fdeceaae42be81204 SHA512 93dcd2ed494158faffe2fa1b6310560dda03866c92a3a572542119b7d98332964582b18af9c32dbbd0e3653247d7fc1235d3434524208db4ee1f32738a260ef4
+EBUILD geoclue-2.4.13.ebuild 1664 BLAKE2B 6c03fdb2d889caadf3d0ea7d32ee4f9497479316591a6c3ff796b8dcc84b8c22b9d4096c7c063d743f40c4001a6f697d31056785a29465d78d87a1d7defd59b3 SHA512 7f8afcff6944b800515b4d2e5bf1140050bb88372043b5945b9fa3ecaa5e0a7cb6c20ae1fcb2e85450f413e921a7180c2b3ebdc4061de5138779f527e96735e7
+EBUILD geoclue-2.5.3-r2.ebuild 1742 BLAKE2B c134c15fb5fde6e0fd4a3ada5a9f5471bc7cee1c2ded9d2fd608d4469c765e3f5751dd790127856c4c478fe28069ca5aeb637159dda610d697f1f576662f18ab SHA512 8df4106658cb34b423a3366d7ef425b6045eb76ef233ebdd6b9358e0d7dbf21e85153a67c826e031ee73ef835bd86abfb25d42f6ce11ab15e11d7f0fde4bab52
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index edf0b2a0f2b9..6dec1598db5a 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
index 894f62cd5014..4f5b490e4dc4 100644
--- a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 095c9ca4bf7f..bfdc972de63e 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -3,6 +3,6 @@ AUX getopt-1.1.5-libintl.patch 352 BLAKE2B 39cb63285b1124a2c8577bd52128e04e0e86b
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6-r1.ebuild 1725 BLAKE2B 4afc4dbe9d363d2f7fb15075ec7cfe053a32979031a8ffa77888813b469c2d20cdc7b6bd67dd613ee3a3c3e9eb4bdb1bac98aee8a6d8609fcfd0833e86b44733 SHA512 d729a7d9af29ae0986bd25cfeffb414ca7f8b848ecf6118d192db679d53e000fe0d2d957b50716012d460710db912a6197ea7af1e6c8b7d6872e86f9b29f100c
-EBUILD getopt-1.1.6.ebuild 1819 BLAKE2B 953d9c9457a19cbd4b39643f1d092858034d486f88a8882a463b5cdc6fe1766cd4ea9136ca1902445ab583e90045392ddef9835182b8c82b6bec8a945b62e51d SHA512 7e938cd0e900fe6046f194dbea40d1051a33b1af6f243236b90d4d1d316a438cfe3124c08c699a4e1ffe6270fb2440154dec1462f02afb50026f1252232c20bf
-MISC metadata.xml 342 BLAKE2B 799fd88b4f38206d301039f579ea9b29920c98946ad0c5fdc57d2ae32d280843c5dfbd4db50d3f4cf7aee7f287d79361878d366ecc8b415406182639a3cffca0 SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05
+EBUILD getopt-1.1.6-r1.ebuild 1703 BLAKE2B fcde4e5494a8e99142c21b69aa9bf51c7a84b565c8736fd24d08b0c93f767e95bd4fde2afcc3e9575f8dc4596f861c1f2c7d9e53dd3f08379ee4261b988d03a0 SHA512 c803517a3a5bce8533caeb700e4bb8735284a74360ab8b71f7c208942b97f8535651f415a7012aa6ba2aa9ac20fa4248d783b1765fc947be292c0521e09b14e6
+EBUILD getopt-1.1.6.ebuild 1797 BLAKE2B fba23dd1ef5b1e8975b095c381084f9e75909761b2a427ad5011a8c279f7614793d8dd1a57e479e25389a3e8c656e3517fe78782adfab1b4426441c46589fb59 SHA512 8456c0cf506f6917aa3f1e2b494a52fa28d611dd1a15c2aa7a0cd120fb727d21cd0b7a795495fd862ff3ac6697f3db3346c9fb57d5b4af2468e8eb407b8a618a
+MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-misc/getopt/getopt-1.1.6-r1.ebuild b/app-misc/getopt/getopt-1.1.6-r1.ebuild
index 285656652b93..25ec7685b004 100644
--- a/app-misc/getopt/getopt-1.1.6-r1.ebuild
+++ b/app-misc/getopt/getopt-1.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/getopt/getopt-1.1.6.ebuild b/app-misc/getopt/getopt-1.1.6.ebuild
index c8484dcababf..e153893915a5 100644
--- a/app-misc/getopt/getopt-1.1.6.ebuild
+++ b/app-misc/getopt/getopt-1.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml
index b7214d2c696f..d33cce94b0d4 100644
--- a/app-misc/getopt/metadata.xml
+++ b/app-misc/getopt/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-<maintainer type="project">
 	<email>prefix@gentoo.org</email>
 	<name>Gentoo Prefix</name>
 </maintainer>
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index 69a2ae93e7c5..660d408758ce 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1,5 +1,5 @@
 DIST goobook-1.9.tar.gz 29274 BLAKE2B 1c2b0b04a7bd21135395d9c3965095973d6a67a9ecb1a6bbe948864eb8bd0e4ed86197de6f5545ce112cc8538abb5ab9fb773b72b569bc9f16c67dcbcd432d5e SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81
-DIST goobook-3.3.tar.gz 34964 BLAKE2B f57a0252467220e734b95714c4086bdf233902dbd93fe9259504a2aee5d8f6c51775d0aa94574defd37dd80673e1483c46eef52154f4f99f20fa6abd1f7545ac SHA512 3921d25b55b35dc18944f8ed700e0f23ab1ad51131a4b98469b0b6a1688ddd79d31c16b36600b4f7b003be64964b3c2c78a257b28805b26ae697bf405d77c409
+DIST goobook-3.4.tar.gz 35100 BLAKE2B 8419f79313a68b108f08a0f7a0b6809d01979a01044d011f53acdf554e87f20f3ac41819a4823abd74e1c8ce0350956e91f17ae9a9342551a263af72b7b6c98a SHA512 e58cdee28ee4464548b04800740d0ffd40ce972efd52af9509f3de603eed9e50fad03cc9116f1d0dc42f77621bbab58d73bff98cf35a3cb55b24a0f04b26cd4d
 EBUILD goobook-1.9.ebuild 1283 BLAKE2B 3c2d2f5e9abd108e7b862277a2ad4e7a1210b54020bedaaf2852c0676ab5bfc0a780b178b9834bfde07a3f06962c88407d622f92ba1320846519d22a9a0ce077 SHA512 6e2b832fa37515cf0261aa6470d3574030bfb77c3b31341727bdaea88dab105d282209d7b9715af4fe4b6cad81666f403f899ac144ba70b203a323753f1680f1
-EBUILD goobook-3.3.ebuild 1140 BLAKE2B 485a6adb4e0813c904753aa32bc3780f108db58ffc4ee36354db99ff4d24a9745eb76dda7511a868b64dbe2ca89b48326d06f79837d6be9a73d021267d451b06 SHA512 6aadf4298c5ca3ba0e5ffa053690587a9e6e9098eae0a65054bca70d035dd2106260ed8102d44ca18330538f52129e53abb1186a89f6bc199c5ee692c375d5a6
+EBUILD goobook-3.4.ebuild 1099 BLAKE2B 5d52a7b5482b52e988aad28298a045d12d5a540eb92465e1453a41672ebd2a0edf511ba33508796d5b0bc70ae7f25d72a50a08133454688bd5f883fc864d0a48 SHA512 984e4f409f4f2c0135e2dca5c2c82b1c89487c8d81c36e613a69927c8fac10f5a2db61eb40fedcddab5477987af65458dbb2a43289cc65814390a312b99ba0c5
 MISC metadata.xml 453 BLAKE2B 000e304e5d8f67c8f2b272b75a3f501e5b73366e8ac75f9a1a8f5f7b4c67ef75e8a8f540f3f30b73ea85d9bf290f0676697094ecf55dc11180d84200194614af SHA512 910714efd3b83f29a6b95b5ac13a7c832ae336a6c5bc7505d6ed44a8342ad31b5b2545c63ec25be525a0cf54efb62283d576cfb11947018f75490453a0823045
diff --git a/app-misc/goobook/goobook-3.3.ebuild b/app-misc/goobook/goobook-3.4.ebuild
index 214c67fd4524..bb2a49f209cc 100644
--- a/app-misc/goobook/goobook-3.3.ebuild
+++ b/app-misc/goobook/goobook-3.4.ebuild
@@ -20,8 +20,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]"
 # dev-python/{simplejson,oauth2client} are deps for the above
 
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}"
 
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index ded005dd92c0..4f413403a237 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,8 +1,5 @@
-AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
-DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 DIST gramps-5.0.2.tar.gz 16706686 BLAKE2B 006c8d10d574d7fe92b661400c257f6f1bc2b2e9e27d788ca761a5d51aa8593f9d26fdccdeeb0fb2860bfe1b08d937e938b3fb21094a42de0fb306d3c16dca49 SHA512 abbf885189bedcf9897bcb3216df86af41498c94b3b9c133350e84a8a61057ab4ed4823c3923823ec99fe0be92648e9259fdceaafd31f968c7d1560a0cd859da
-EBUILD gramps-4.2.8.ebuild 1601 BLAKE2B 45868269d9ba22e5a62f44cf3e87be2e50c1cababffed858e27fb828cb7c1ed4fe54cd955932ffe24921672e68d7ac67cdbbf6dc212dceaff88b779b19b390d7 SHA512 751c5b2fc03b4b890531d756ff8f3c09cf33eb63eb56c0af80412f58abb5f84f4d9a0ebabed06f50828665aaa19f47e8bae081436a9e02603486615f689a6ddf
 EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
 EBUILD gramps-5.0.2.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
deleted file mode 100644
index 8d43447027dc..000000000000
--- a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0177ce7..7aaa681 100644
---- a/setup.py
-+++ b/setup.py
-@@ -160,27 +160,8 @@ def build_man(build_cmd):
-             subst_vars = (('@VERSION@', VERSION), )
-             substitute_variables(filename, newfile, subst_vars)
- 
--            import gzip
--            man_file_gz = os.path.join(newdir, 'gramps.1.gz')
--            if os.path.exists(man_file_gz):
--                if newer(filename, man_file_gz):
--                    os.remove(man_file_gz)
--                else:
--                    filename = False
--                    os.remove(newfile)
--
--            if filename:
--                #Binary io, so open is OK
--                with open(newfile, 'rb') as f_in,\
--                        gzip.open(man_file_gz, 'wb') as f_out:
--                    f_out.writelines(f_in)
--                    log.info('Compiling %s >> %s', filename, man_file_gz)
--
--                os.remove(newfile)
--                filename = False
--
-             lang = man_dir[8:]
--            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1.gz'
-+            src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1'
-             target = 'share/man/' + lang + '/man1'
-             data_files.append((target, [src]))
- 
diff --git a/app-misc/gramps/gramps-4.2.8.ebuild b/app-misc/gramps/gramps-4.2.8.ebuild
deleted file mode 100644
index 55d28850eb5e..000000000000
--- a/app-misc/gramps/gramps-4.2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	eapply "${FILESDIR}/${P}-uncompressed-docs.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --resourcepath=/usr/share )
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index a4a495054a83..8468175965d9 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,7 +1,9 @@
+DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce02388a61fa1c426cc16e97fe509110c2f129203882504dd4d7bbe6ddf95a01d7147abf78a0a9b6c898af89814ee SHA512 7618e34e35726670721dfd12e1434d5ffe4221ffad5d751ef26dc26edab4334c847582bbd4f50cfb93f37a07397ccc467e240adaf3dcf1d9446e0ca6faff7721
 DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf80760234df00241d9eaaced3bcf37bb8b4bb282c39491f69c9ad6fea0f89af3836c29e23294356847bb88fce645b8 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180
 DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e166aa9fe00d44295031d336651bbb74e2ab73a6ae85275f02f8bf035b6798e280055dd6e38dd139f30c6c8 SHA512 4c47bd18e7458ca7a6adf0684872923b4e49e6bfe481269cf9f77dee29dd47dbacf0d557890080618b4d3f08766fc8fae32de7682167642f0705e5b3b6b5dc01
 DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
+EBUILD khal-0.10.1-r1.ebuild 1268 BLAKE2B 8ada46a8439f190bdc9ebc713423b409bcf646c12ac37d59ae2696d1a9e18209f79112b179bde6e3a4c6583a8b002855e4a94a8492d95790d7426cc205f1ffa4 SHA512 f5f4d34a73e4af6d5ff4568a3aacaddb44911001447457d0ccc1c778725348ce200e5c94e70cc43936831e5f35ce53beeb3a7d579e39c4040dc721457228b7ce
 EBUILD khal-0.9.10.ebuild 1208 BLAKE2B 63d1490b3b59a7af0413049b44257cc2f0f57cff203e086d7b65bc29dc34c6f87eed34c09bfd89cff0afb767601b52d5384efb8c22849c4430a841d1154aac77 SHA512 44def2a12f2303881b7ed28ee189a48bfc75078f0125151e8dc7848cce9979c75a51d0a378022c9564da8e8b5403f34da346018a4485827b9b6c91c10ef0b1c5
 EBUILD khal-0.9.7.ebuild 1202 BLAKE2B 158a5effcf53a3d2e1e3945bc6058cba8839f9a2fd33ccfcb7c1b3c2be8b6d29398eb709e987b6a8912810d6ff6c5651e8f39070aff43022f0f0b415a95a4d11 SHA512 a1eb0c2282e0174bc865208bfe599c276941fa3365ce49d9b42aba1277d97ac8bba78fece9a42f6699f1a2fd36da83994bd1e806c483948600a705642a25134b
 EBUILD khal-0.9.8.ebuild 1201 BLAKE2B f507299f754add04f5e84ca4c59b770ef1d637556d35a028181c74f90748586256d23e2bc858b6f1bf8a441b01ae4b1b3b56a59e1ae43e8667055cd461ba7085 SHA512 9c0675ad1426f3bac09f1665b0a21dcac8b3cd58ad0ee1b181d27fba62568473aac56cdeb071348eff1230761f9c1152d3a559eb36b7aa34d571885fbc99ba11
diff --git a/app-misc/khal/khal-0.10.1-r1.ebuild b/app-misc/khal/khal-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..ce7106ea0df8
--- /dev/null
+++ b/app-misc/khal/khal-0.10.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 6c65fac4ca8e..d7b3d0b11a2c 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,8 +1,6 @@
 AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.11.0_pre20170527-r1.ebuild 5594 BLAKE2B 7833584b733ca61b452ae4786d29f0b10f1cbf463a1f845ff32a8a8b9977fc196adabb6a6d9335cda10231868d6e5ea79ec862509927bd2ac371cb97e92d4ab8 SHA512 6c44114cc4067457ef452fb5f9d80463056786ab36c467e9c13c98aecb98bce3cd1fa270a71d769006370640e3d3b9ede29368f600435cac5f5c74d455e38809
-EBUILD lcd4linux-0.11.0_pre20170527-r2.ebuild 5594 BLAKE2B 8c7741943295bab61cae7e2ec667b4c4c936248df0bba28ddea5b89bbe27b38312916db62c44a5f40e0918cfe5d209d0afec89ac2db50d4e6a9571e519c63422 SHA512 2ba802b021471bd0a36fa1a3b255dfabe7f93ed876a11d448597cdbd9fafb72f95a0d68a694ab00b8766cb53941be75eb17d5b8d4dd67eb035c8bad95971ab46
-EBUILD lcd4linux-0.11.0_pre20170527-r3.ebuild 5552 BLAKE2B c24ce7b6a82ceb200a9067cb70b83f8fb085defd706bf60b92385ec1fb7b7967d90754296890b4e2fb319dbf6e3e066426b07f3f2e99b720f82460799bd129b3 SHA512 802bb7fbd25c02d0a87a35a6bf50e5cfc9fb49c3f9624feb776c1ae9f74a12802865b71e343d05be3a9559c2ef6d16520d3452392ace245451ecb28f35803f4a
+EBUILD lcd4linux-0.11.0_pre20170527-r4.ebuild 5556 BLAKE2B 2bcdeb599002b65209d713bcc6185236d89e40351f490854048ece83ec2c376573029061034f2009d582610bedd5624878152882c69f255f0e586e2e645f5ae0 SHA512 e7c0dbb00a1dd79bf4682e63c9f3fa4508b9967cf9a1cc2a27c7f245304fef06787d1b9886c5eb509966d330b6621313a2f3e25f1dfa1d5875964e65d56970c8
 EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5550 BLAKE2B d9488943d12768363e4fe26511e203856de5a7aa61d79c5668f3b39a7bd72b0b07486b90d2e15c277de8ef04a1b828ff6e77cfe6b8eee14a5a7af5c735ceb3cc SHA512 63191fa94067bf27955c830e24fe13c49b9217ef9eedbbd62fc1f0399c7242062696d076dbaff98fb9a0b33fab297fc94069ebae6610c0ad39467980d75f350c
-MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
+MISC metadata.xml 3927 BLAKE2B 23ddc24be9b634b9372b6c16ba9f897b3e871f62e495451d8df16fa4559b73e687702012c18c7d14aa0dbd9bc1fb273e361fe0fdf67a91aa5c7039685a181c1e SHA512 ff1905f6e30a0923a1e85a554ea46cedbb1435b29a38f82332890f79bbc561294361687b8a49c164c89d4aae57d8a10daff53e47850dcd30ca3238bea622962d
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild
deleted file mode 100644
index 0d0113516571..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dmalloc outb"
-REQUIRED_USE="
-	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
-# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
-# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
-IUSE_LCD_DEVICES=(
-	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
-	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
-	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
-	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
-	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
-)
-
-# Define the list of valid lcd4linux plugins.
-# Some plugins were removed from this list:
-# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
-# - ppp: It has been replaced by the netdev plugin.
-# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
-# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
-IUSE_LCD4LINUX_PLUGINS=(
-	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
-	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
-	proc_stat python qnaplog raspi sample statfs uname uptime
-	w1retap wireless
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE=${LCD_DEVICE,,}
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
-REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_astusb? ( virtual/libusb:0= )
-	lcd_devices_bwct? ( virtual/libusb:0= )
-	lcd_devices_curses? ( sys-libs/ncurses:0= )
-	lcd_devices_dpf? ( virtual/libusb:0= )
-	lcd_devices_g15? ( virtual/libusb:0= )
-	lcd_devices_glcd2usb? ( virtual/libusb:0= )
-	lcd_devices_irlcd? ( virtual/libusb:0= )
-	lcd_devices_lcd2usb? ( virtual/libusb:0= )
-	lcd_devices_ledmatrix? ( virtual/libusb:0= )
-	lcd_devices_luise? (
-		dev-libs/luise-bin
-		virtual/libusb:0=
-	)
-	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
-	lcd_devices_mdm166a? ( virtual/libusb:0= )
-	lcd_devices_picolcd? ( virtual/libusb:0= )
-	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
-	lcd_devices_png? (
-		media-libs/gd[png]
-		media-libs/libpng:0=
-	)
-	lcd_devices_ppm? ( media-libs/gd )
-	lcd_devices_samsungspf? ( virtual/libusb:0= )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_trefon? ( virtual/libusb:0= )
-	lcd_devices_ula200? (
-		dev-embedded/libftdi:1=
-		virtual/libusb:0=
-	)
-	lcd_devices_usbhub? ( virtual/libusb:0= )
-	lcd_devices_usblcd? ( virtual/libusb:0= )
-	lcd_devices_vnc? ( net-libs/libvncserver )
-	lcd_devices_x11? ( x11-libs/libX11 )
-"
-
-# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
-DEPEND_LCD4LINUX_PLUGINS="
-	asterisk? ( net-misc/asterisk )
-	dbus? ( sys-apps/dbus )
-	gps? ( dev-libs/nmeap )
-	hddtemp? ( app-admin/hddtemp )
-	iconv? ( virtual/libiconv )
-	mpd? ( media-libs/libmpd )
-	mpris_dbus? ( sys-apps/dbus )
-	mysql? (
-		|| (
-			dev-db/mariadb-connector-c
-			dev-db/mysql-connector-c
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	wireless? (
-		|| (
-			net-wireless/iw
-			net-wireless/wireless-tools
-		)
-	)
-"
-
-RDEPEND="
-	dmalloc? ( dev-libs/dmalloc )
-	${DEPEND_LCD_DEVICES}
-	${DEPEND_LCD4LINUX_PLUGINS}"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	# Enable all users enabled lcd4linux plugins
-	local myeconfargs_lcd4linux_plugins
-	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
-		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
-		fi
-	done
-
-	local myeconfargs=(
-		--disable-rpath
-		$(use_with dmalloc)
-		$(use_with outb)
-		$(use_with python)
-		$(use_with lcd_devices_x11 x)
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
-		--x-include="/usr/include"
-		--x-libraries="/usr/$(get_libdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install sample config, and must have 600, as lcd4linux checks this.
-	insinto	/etc/lcd4linux
-	insopts -m 0600
-	doins lcd4linux.conf.sample
-
-	newinitd "${FILESDIR}/lcd4linux-r1.initd" lcd4linux
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild
deleted file mode 100644
index b13ecafe8c15..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://lcd4linux.bulix.org/"
-SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dmalloc outb"
-REQUIRED_USE="
-	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
-# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
-# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
-IUSE_LCD_DEVICES=(
-	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
-	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
-	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
-	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
-	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
-)
-
-# Define the list of valid lcd4linux plugins.
-# Some plugins were removed from this list:
-# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
-# - ppp: It has been replaced by the netdev plugin.
-# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
-# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
-IUSE_LCD4LINUX_PLUGINS=(
-	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
-	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
-	proc_stat python qnaplog raspi sample statfs uname uptime
-	w1retap wireless
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE=${LCD_DEVICE,,}
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
-REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_astusb? ( virtual/libusb:0= )
-	lcd_devices_bwct? ( virtual/libusb:0= )
-	lcd_devices_curses? ( sys-libs/ncurses:0= )
-	lcd_devices_dpf? ( virtual/libusb:0= )
-	lcd_devices_g15? ( virtual/libusb:0= )
-	lcd_devices_glcd2usb? ( virtual/libusb:0= )
-	lcd_devices_irlcd? ( virtual/libusb:0= )
-	lcd_devices_lcd2usb? ( virtual/libusb:0= )
-	lcd_devices_ledmatrix? ( virtual/libusb:0= )
-	lcd_devices_luise? (
-		dev-libs/luise-bin
-		virtual/libusb:0=
-	)
-	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
-	lcd_devices_mdm166a? ( virtual/libusb:0= )
-	lcd_devices_picolcd? ( virtual/libusb:0= )
-	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
-	lcd_devices_png? (
-		media-libs/gd[png]
-		media-libs/libpng:0=
-	)
-	lcd_devices_ppm? ( media-libs/gd )
-	lcd_devices_samsungspf? ( virtual/libusb:0= )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_trefon? ( virtual/libusb:0= )
-	lcd_devices_ula200? (
-		dev-embedded/libftdi:1=
-		virtual/libusb:0=
-	)
-	lcd_devices_usbhub? ( virtual/libusb:0= )
-	lcd_devices_usblcd? ( virtual/libusb:0= )
-	lcd_devices_vnc? ( net-libs/libvncserver )
-	lcd_devices_x11? ( x11-libs/libX11 )
-"
-
-# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
-DEPEND_LCD4LINUX_PLUGINS="
-	asterisk? ( net-misc/asterisk )
-	dbus? ( sys-apps/dbus )
-	gps? ( dev-libs/nmeap )
-	hddtemp? ( app-admin/hddtemp )
-	iconv? ( virtual/libiconv )
-	mpd? ( media-libs/libmpd )
-	mpris_dbus? ( sys-apps/dbus )
-	mysql? (
-		|| (
-			dev-db/mariadb-connector-c
-			dev-db/mysql-connector-c
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	wireless? (
-		|| (
-			net-wireless/iw
-			net-wireless/wireless-tools
-		)
-	)
-"
-
-RDEPEND="
-	dmalloc? ( dev-libs/dmalloc )
-	${DEPEND_LCD_DEVICES}
-	${DEPEND_LCD4LINUX_PLUGINS}"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	# Enable all users enabled lcd4linux plugins
-	local myeconfargs_lcd4linux_plugins
-	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
-		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
-		fi
-	done
-
-	local myeconfargs=(
-		--disable-rpath
-		$(use_with dmalloc)
-		$(use_with outb)
-		$(use_with python)
-		$(use_with lcd_devices_x11 x)
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
-		--x-include="/usr/include"
-		--x-libraries="/usr/$(get_libdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install sample config, and must have 600, as lcd4linux checks this.
-	insinto	/etc/lcd4linux
-	insopts -m 0600
-	doins lcd4linux.conf.sample
-
-	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r3.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
index 75e8edadfc1f..064c6ffca9da 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r3.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
@@ -40,10 +40,10 @@ IUSE_LCD_DEVICES=(
 # - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
 # - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
 IUSE_LCD4LINUX_PLUGINS=(
-	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
-	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
-	proc_stat python qnaplog raspi sample statfs uname uptime
+	apm asterisk button-exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv
+	loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3
+	proc-stat python qnaplog raspi sample statfs uname uptime
 	w1retap wireless
 )
 
@@ -107,7 +107,7 @@ DEPEND_LCD4LINUX_PLUGINS="
 	hddtemp? ( app-admin/hddtemp )
 	iconv? ( virtual/libiconv )
 	mpd? ( media-libs/libmpd )
-	mpris_dbus? ( sys-apps/dbus )
+	mpris-dbus? ( sys-apps/dbus )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	python? ( ${PYTHON_DEPS} )
 	wireless? (
@@ -150,7 +150,7 @@ src_configure() {
 	local myeconfargs_lcd4linux_plugins
 	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
 		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}"
 		fi
 	done
 
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index a359d32d1f1e..b2c00d71165b 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -16,6 +16,7 @@
 	<use>
 		<flag name="apm">Enable the APM plugin.</flag>
 		<flag name="asterisk">Enable the Asterisk plugin.</flag>
+		<flag name="button-exec">Enable the Button plugin, to execute something on keypress.</flag>
 		<flag name="button_exec">Enable the Button plugin, to execute something on keypress.</flag>
 		<flag name="cpuinfo">Enable the cpuinfo plugin.</flag>
 		<flag name="dbus">Enable the dbus plugin.</flag>
@@ -29,6 +30,7 @@
 		<flag name="gps">Enable the gps plugin, for reading gps coordinates.</flag>
 		<flag name="hddtemp">Enable the hddtemp plugin, to read from the hddtemp daemon.</flag>
 		<flag name="huawei">Enable the huawei plugin, to read from a huawei device.</flag>
+		<flag name="i2c-sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
 		<flag name="i2c_sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
 		<flag name="iconv">Enable the iconv plugin, to convert between encodings.</flag>
 		<flag name="isdn">Enable the isdn plugin, to get information about ISDN.</flag>
@@ -36,12 +38,14 @@
 		<flag name="loadavg">Enable the loadavg plugin, to get stats load</flag>
 		<flag name="meminfo">Enable the meminfo plugin, to get memory statistics.</flag>
 		<flag name="mpd">Enable the mpd plugin, to read from the Music Player Daemon.</flag>
+		<flag name="mpris-dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
 		<flag name="mpris_dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
 		<flag name="mysql">Enable the mysql plugin, to get mysql database information.</flag>
 		<flag name="netdev">Enable the netdev plugin, to get interface statistics.</flag>
 		<flag name="netinfo">Enable the netinfo plugin, to get more interface statistic.</flag>
 		<flag name="outb">Enable raw i/o access.</flag>
 		<flag name="pop3">Enable the pop3 plugin, to get notified about new mails.</flag>
+		<flag name="proc-stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
 		<flag name="proc_stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
 		<flag name="python">Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.</flag>
 		<flag name="qnaplog">Enable the qnaplog plugin, to read a log from a QNAP device.</flag>
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index 0dc2c9d007fb..468d8d2fd7b0 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,3 +1,3 @@
 DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
-EBUILD ledit-2.03.ebuild 747 BLAKE2B 0fc8354c5ddd5b3cbb4645d3a81ea18708248137fa9dd27a9b09f9c7222493e2c9a1ecd789ad9880223bf1b2e9b2d04f7684c8f7086a6da566a981b13745132c SHA512 5f154b0a64c994e9993f367618f45158a541cbea5086aa1ef95efbefff9b3124be690d7562cf5ad00b835829dffc8b290deeb9c6c602bb8045b84c7fb94c8462
+EBUILD ledit-2.03.ebuild 737 BLAKE2B 6c481bbfd0bf1f45ec15f83a364d302ba0e4d1193b3a432acf6bd7aede5e7b3bf019ce2a04bcc6b66fa5662dbf72abec595f975d40a19b319e21b8914dc0b36c SHA512 be5a5b2ea702cc30d16d3f254dcc485458bacdbca0405ea94d87f750fa6c7798f93913cf2b5b2814a69d207223e2c7083b3e0a8569568d0305a4bf292d971e07
 MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
index 4810b328c9a0..ecbb81e13662 100644
--- a/app-misc/ledit/ledit-2.03.ebuild
+++ b/app-misc/ledit/ledit-2.03.ebuild
@@ -17,7 +17,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 RESTRICT="!ocamlopt? ( strip )"
 
 src_compile() {
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 81ebaa853e43..0de4dbaef40f 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,8 +4,8 @@ AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772
 AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
-EBUILD mc-4.8.22.ebuild 2854 BLAKE2B b62a578f351b1535f3b48ddf01c21aa5ab5bbf02cdabc9b967a108cbaf1304ad3130ea26211d06e45697d00cd65bb7842badbfecdf6f360ae8443afaf812777c SHA512 6534293609a40883ff86f9cbf1894b9898c7a8ea910b1a05f8057ce30e26e726b13f5bab7060e64196376fd244b90f41e48632860684c3c5bb1f85eab6bedf0c
-EBUILD mc-4.8.23-r1.ebuild 3039 BLAKE2B bc3f902ed3351483b693be1df3579652a2003175408c846671a0b2a9a1e03ae55137f3ffb18c2a73fc75bcc33f4b981131f459d25959718dd95b3a987eb47d03 SHA512 641b017d194863d720abbbad06e97d9285e72acdeced76154ab546a75df5719a92080a98878b85703667be60eba152d26e8c0a31bc053d4aae569b73aa132bdd
-EBUILD mc-4.8.23.ebuild 2864 BLAKE2B 4d2fa3896976b9775a0077db49890995d8348caa003357c27cf429c4b372381cb21a66b8477fd28bcbd821b143f94c4753f91abdc96a1f60c1de2dc746412a0f SHA512 439957bfb9c4441a3e344ff8ea7361efec8a19f19a5277237b4ac98152fe59213451d3b04b430c0e558001c7f10119381aed7fa4e3e933a5b02529dc7f948bbf
-EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
+EBUILD mc-4.8.22.ebuild 2832 BLAKE2B 848f4a579f0b0217742e3f6a7e0462851ad9dcf74c0bb1da65ceaf9adc1ab8be4e23e3ecc734ea0a55efcf7753f3536dd9de102830c817b013d33ebd4170ca9e SHA512 6bccc63cc5f6bc41c4592cef740908acaf8034f2ebb6e356ea4c61c987d07bcd3cdcf41d6f9136c35f89b7dc7f247892a1eda4e797e03877d8b1a0eba322b3a3
+EBUILD mc-4.8.23-r1.ebuild 3017 BLAKE2B e28e264661f3a35a67b80e3f144ad960cb84c1ddee69e2c3e5afa2f0fe190b10679f7f0712543caeb44f81b7576dd2304f8de97c6ca092cf0f56e9fc74c13aa0 SHA512 dde6d1972e25b623e05df245170a5fec0fc984a5be9c9b5889538458b230c42f6575798c2be2aef2eab86855978f7cafa87823ccc1a9f062a15eaf656130695d
+EBUILD mc-4.8.23.ebuild 2842 BLAKE2B 3e411a758f272945d63219c02aeba93fba8bd1f0111cf69cb928514fd619d846b16de0ff1a553e298d2253ca64f721afbe7721e3af21168c58cdd0f0bab7f88a SHA512 8f60a7d096b874e129b7c35666641405deacc6da32cba5f8f88bcc7264cc525ed54850bfaedbf768302836aa7a3ac97667fbee5fab6d27fa89ad9c1d187873e8
+EBUILD mc-9999.ebuild 3101 BLAKE2B a0dece16076078127c94807575dd7edda7bbf2dccaaeb8821cd290ee56953bbb49d1f94bfb9551eaf570b7fbef58a4613551fc5b8d055a3c20cec6a3bd15a2cc SHA512 2dcd2f675359c72c43f7c4c9e4540e5d438e91abe6cf6c05ad12f9ec780e7e10ec0b72f0b9d83fd099960a63ad13a66c09a3ab709ef6774a3f7b0ea4ea983791
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index 769e4414056a..a246a79ffb5a 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 48f903c3ae54..9f58fc202682 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-4.8.23.ebuild b/app-misc/mc/mc-4.8.23.ebuild
index 5f71da448cf0..32597904a63f 100644
--- a/app-misc/mc/mc-4.8.23.ebuild
+++ b/app-misc/mc/mc-4.8.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 471af7fa7dca..14377f18812e 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -15,7 +15,7 @@ MY_P=${P/_/-}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index a9e815b03ba0..78049af3b973 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 596 BLAKE2B 2be7443cd13baabc730aef2fbbaaad7218b972ba760e4c5dd3957828a98645641b7571b82445373e0333ca8a87f52d28fae311abf4f1c58b697d67d66c8ddc57 SHA512 71401e7ffa8e612a68eed888b3fecac24fa1495151be22b10be81f7ab1854c5bb8d034afe571a173260aa04b4ba73d7a29e265d3075668f2c3240345d0a029be
+EBUILD mime-types-9.ebuild 574 BLAKE2B dee8012293608bf0308b1e48b79cdcf1fef1ec203994d19c78ca400a05a1ab256877e48bf4931abc32ae174473b9803de30401df200d1f5c8f47cf90919e15aa SHA512 ce7d3499ea38d568ec4ec5a29a02cc1f4d51e59a02671c1b8fdcb346b3a40e96b05956e9e406834fbfcf3e6e9819a23956edbeb5839cdda1f5b86f7ac5840957
 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 0d82c67f0b85..dc95bd899a6f 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 8808374dbaa7..3cf503a91a16 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,11 +1,7 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c SHA512 99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
-DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3 SHA512 5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
-DIST mosquitto-1.6.2.tar.gz 576747 BLAKE2B c0815f1f0a964ee5cc26fc9a1d3c222b5261e29e1520f2b3ddacbe61e1af44c47040db1d9b71721f6ef9b42f378d1974d994065a8558a1f3f759dc5ca81db1a7 SHA512 d1c13df4409eb20ccc00a67b07a4af5c5ce668a403a4605e2bae4f5869b256ebe5d9a001d009cb0e34bc7b3cfee96779fc81099b170ff03af3ca43f05567912b
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170 SHA512 0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
 EBUILD mosquitto-1.5.6.ebuild 2506 BLAKE2B ca60820682eb14f4bf9e70413748ca19c8da6d160bcd67641f52a2d39587275203d36d22e893267a10fa417b5ffb8a5a165e76432ecb1fe78c0bb85390d92fe3 SHA512 3200b2f1d264e1a1812f9ba3efb813aea95f4d70065abb178621c644bc44796538aac05f997822916458e6ad664a3dbbe68e8693b2e4856d6b5834139b870dff
-EBUILD mosquitto-1.5.8.ebuild 2406 BLAKE2B 318c6b1ad9a6f51fa4a40f0900bb699ab9312f43e6e5a8021ae9fcff1e8cc3fc7f5c52713f3959677824b4f0baaff02e7974c4922f0e1ab51e4eb21729a8f899 SHA512 6186bec3ccc77e6da1e9072df735f8824c3756799274277980343cc624bd8a84f8c8cff23aa9f9a2fc98282ad56a7d3c7d8b1747cab60fce2e6522989ccc7a3a
-EBUILD mosquitto-1.6.2.ebuild 2735 BLAKE2B 413cba48079c6d17a1f8244f41dcb4b7bd69dec92b9d74a5b316c6f682a4f9bd2dc1925324872f34f402cf6303a14e823a1626c2188925bd136fa7edc3c20f46 SHA512 2dc2f4a983da57f40d77aff954f8c84489f5f2f6f73afdb00e28ca9ef5517036fea3abef3826c288bac57a8a4334e5fe40bdd1422f504e6a49a6756f444b396a
-EBUILD mosquitto-1.6.7.ebuild 2748 BLAKE2B eabe33dbad860baa0331289bad1fea8e8cb4b88982db0369cf408a425224dec9b7c2d71e3e474ea4a50f120e5f32399be10da0344391cb9eb0abde26b6f119c7 SHA512 f2a6b485baf80efd5a633082d78d591de41083aad8fc0f3568fe5b9c4568827220efca1638a1d3cb906a9ea8b1915fbc594ab1631c4c1b449e48a2c0eafe4660
+EBUILD mosquitto-1.6.7.ebuild 2746 BLAKE2B 40fe2db381ac94dfc4c329605b8ff5814280b7fd056ae8d1e067d57d5759658b53137d521877171ca14cfa103629b56b5504115e03790e058f4a94aea2e31a58 SHA512 17ca86ab1c65079ef5296561ab7911b8ac5243b09a3c0c1168c95145ced1afbc258cf8759a04e0a85e69068b278ac3306396118ecf1442115024e9492a8814b3
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.8.ebuild b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
deleted file mode 100644
index 739d887f2e64..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 systemd toolchain-funcs user
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="srv? ( net-dns/c-ares )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	python_setup
-	rm test/{broker,lib}/ptest.py || die
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-1.6.2.ebuild b/app-misc/mosquitto/mosquitto-1.6.2.ebuild
deleted file mode 100644
index 0eb52c398c30..000000000000
--- a/app-misc/mosquitto/mosquitto-1.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-any-r1 systemd toolchain-funcs user
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="srv? ( net-dns/c-ares:= )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( dev-util/cunit )
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CLIENT_LDFLAGS="${LDFLAGS}" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	# Remove failing tests
-	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
-		-e '/02-subpub-qos1-bad-pubrec.py/d' \
-		-e '/02-subpub-qos2-bad-puback-1.py/d' \
-		-e '/02-subpub-qos2-bad-puback-2.py/d' \
-		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
-		-e '/11-message-expiry.py/d' test/broker/Makefile || die
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index c259a27c56d6..7a43de2971cf 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 4efc9cf2fbbe..a78ba38f4328 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,6 @@
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
-EBUILD neofetch-6.0.0.ebuild 649 BLAKE2B babedb2052e50e2d89c03d23c9031692b7db74339a1fb2f23d55d91bddae11cdac4fffc1516d107017a14f40429381d247436a955556c89b1c492078d7e38dfa SHA512 f1002ccf79cc53cf6c9036767bb2825e52d37a49107ce6b2921ff20abae48694eec473ec9701d692b375793af3414edc4ef22922adbe3bdefb9e92e02673b3fe
-EBUILD neofetch-6.1.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
-EBUILD neofetch-9999.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
+EBUILD neofetch-6.0.0.ebuild 637 BLAKE2B 5e6b83694bd417aefabc73221164f785bcb11de5bfc2865512349dad6c1c423aa9fdc49c805fb70a7ffd93ba08c41c116f028682a2515bb3cbfe6ea4c20d5ef6 SHA512 c2087360b880f6013e1a6a002a32665002318f06169ff6dbeb9907f62de0b76c81cb51f490f7ccb1bff2fd85a452cf064c23cac0db98d531dff9053d363d9765
+EBUILD neofetch-6.1.0.ebuild 639 BLAKE2B aae31bb81d6bd7cd14faf2a3134ca8d0ddfc2b3f877d85ebc353daaeae2d982f2c097da768d9ec05d01911a34802682a870f76afa25bfcd55f64d6d34c759e0e SHA512 0ef2a9662f623dfc910644827003d9f66442a5c0fbfe12b12ff12f3c4d09d67c7b226161df4ad137c0dfe658b9d407dc97a6caf5f5d0128420b08633c6f10157
+EBUILD neofetch-9999.ebuild 639 BLAKE2B aae31bb81d6bd7cd14faf2a3134ca8d0ddfc2b3f877d85ebc353daaeae2d982f2c097da768d9ec05d01911a34802682a870f76afa25bfcd55f64d6d34c759e0e SHA512 0ef2a9662f623dfc910644827003d9f66442a5c0fbfe12b12ff12f3c4d09d67c7b226161df4ad137c0dfe658b9d407dc97a6caf5f5d0128420b08633c6f10157
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
index 7e6422e1f5c0..102c239995d1 100644
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~mips x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~mips x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/neofetch/neofetch-6.1.0.ebuild b/app-misc/neofetch/neofetch-6.1.0.ebuild
index 45192c9d63c8..2df09f60d624 100644
--- a/app-misc/neofetch/neofetch-6.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~mips ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 45192c9d63c8..2df09f60d624 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~mips ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 8ccb3473df2a..101a936376e4 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -6,6 +6,7 @@ DIST nnn-2.3.tar.gz 56286 BLAKE2B cc1d79ccf467ba47fc4b50f335e7f2a9b1962555afacc4
 DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d97420a4f5f237bbc41cc7157bc43cd3c9ce83b04af3dbd7c6ecf467cf690922cfe36cfeff5f87ef365 SHA512 b285b14bb73e81a8480b19be7adf0b6efebc632cae82cddf9f040e644dd07dfef4e5c27df2e318aaa21eb1ac4d9e20b6d89f66b8e9b481160bc49f1302806722
 DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
 DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
+DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
 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
@@ -14,4 +15,5 @@ EBUILD nnn-2.3.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f
 EBUILD nnn-2.4.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf859db76865d07a485b57a873630dd2808c3f4185b09de196da72cde083b1a55f1992529c8aa158a04158 SHA512 52ab6fb05dc13ea1379cc75319e2fe7ca35554bb9dd0136305ac7dc3eb2c5a446563bdb054a79838601c169e3b3fc0f46b52b965d7ca5e3e82c355e36e59ed02
+EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.7.ebuild b/app-misc/nnn/nnn-2.7.ebuild
new file mode 100644
index 000000000000..6ca9e1095ee0
--- /dev/null
+++ b/app-misc/nnn/nnn-2.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 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 323cfc441f2b..1b9b532a6b51 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
-EBUILD pax-utils-1.2.3-r3.ebuild 1810 BLAKE2B 49f27dbff6e2ca12b14e53aeec345345a8b0e775862fd963a4bb429104bdaa208d7e38c5d658783cff4f8c4cdbb375d9b0f576e64900ee30c77039743f8fbd4b SHA512 e1e76fe68464cbdef0e2627dc2c947251ec48c6302481b6ece21c42c1819e819f764ff9f5512286d75fe0d630c45cfabe19fde87e039f68e73ff8f651a773734
-EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
-EBUILD pax-utils-1.2.4.ebuild 1769 BLAKE2B 8c1bc1db322924b228ea5c1eb4862cbdcfdd2d8d2efe0ce9f1a42a64367e6e56f2cf7eb754a34db9e205b0f01aada53887511502157d772c1dc8c78971769f63 SHA512 cfe892a2cc57cc2b89a22cefacbf033a824151ce64b639f8b841c8fee97e8b223689186e9f6a6737d8e24b59eeb7637916f20edf2a03e1afe62d8567469d8a5f
+EBUILD pax-utils-1.2.3-r3.ebuild 1788 BLAKE2B b76350456cadb9e1814733f34cb0fe49ccb9c32c591cd72f1bda70910d511d8ef649852e248aa071b0fe4c15d0327a7c82ca7806412909e2971f0be2a022d9d6 SHA512 26631d098650f61444109bd4cc11a93d3e34dd484fe45da8980eee24f5d65dea4131b9eb814c521b8472a223c870a969c69d15c36ac028a726a82038cf0b41a5
+EBUILD pax-utils-1.2.3.ebuild 1455 BLAKE2B ab4d234e6513ea35fce6f8c6e57c4f8ff60dacaae4bbe03f5ab1b16a4bac139a7281559691d470285e6c0877b2d3058445fe5af2fb42ead23fc71ac7dbf9ef16 SHA512 d76be941d202b762d7d2adab5129dc95a25a1484d7f412dbde3c3b825ac75304fc3b1f3aa60b33dc0792d34b69e4a6d1ccc81ee9f839b4d77ff93d8a8d9cb258
+EBUILD pax-utils-1.2.4.ebuild 1747 BLAKE2B bc712a624f97c19ba5a8cd71e55532430d359b436d0e0b8a5f995c42dac851dccc32c08f5eb20d9e8497632c011a982ff52eca28eb0c4a60c766acb5b3ef5657 SHA512 a56682c1b730f9416a9ff8626826089231b44b04522fd567e3e2bc31400706899be16b02af40cbef31941615fb22423ddd05175f6dc6992c51d769718d5cc481
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
index f405cb2e6dbd..b80584839386 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index 5aa96c1c5b57..25b7d7db0326 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
index 52908fc467fa..9b9c2388356e 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 45f8a6828c0b..da17d02a54bc 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -1,47 +1,24 @@
-DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 DIST github.com-BurntSushi-toml-v0.3.0.tar.gz 41554 BLAKE2B 2af83c65e70addb9d95a242c3ad7748d6d273578564009bd29fecf8537194e965f29d5087975792e60c39f250e3bafe313ce313305ef481ca6f05b81b4f33aa6 SHA512 3f3cc441787c41029c4b4944e6437919abbd31d3d53b361ce22f6237d76655357936bab90ee8f3340ea9550cbe90f3a369b3209321e8bb6bbeca0892babca6fe
 DIST github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz 11663 BLAKE2B 17e4c4d8403663b27c85074f456c60f7da3d43c875816b6f4da32ccc4c422b59cb28c11a894705430b6001766ba3a63ddaade95ab1510f87ce19cfe0b1391d04 SHA512 9ba6de3249259ddbc81faef63e0c801822687f875acb5965dcdfd52c85bca887dd5248be731e0731f1dcf274de64a87630cb902fc2e15718ffb327922f023bea
 DIST github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz 36832 BLAKE2B a66fdb5126e9a9f7dfd52360d0a26916764a96df95b1d995ea1a83aac26227e16d3a2c3a419746c8ad03ba5bef4724a6abadf0ee3fdd84f347d595b9db88b6e1 SHA512 fb84020d5519cd0c5c2c06df598122e1bad3a31ed6b545aae66547e43d48d3da04a75799db9ca8957af1bd47ce2c1542440287c6722e0ab2c27b23ea9631e09a
-DIST github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz 36845 BLAKE2B 2c99997fcbc05cf6eee1d8f5829b331d14d9981598a913832a71c58a19fa889a4b270df7f4612a0dff3eddc03dcf6d4be42c05f762010a9ed4f53817b0b61d86 SHA512 f8d2c9c40c594a3ac2724c7109eaf22b212b644c39846f6c86ee4199c61f7197b0e276dfefdd037accdbfdb24ddf850a2b3608fbaaeeca2048269c219dbf93cd
-DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
-DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d
 DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz 230977 BLAKE2B a551b24b20e846e81305181130bdf47af11ab0ce93d9b2c7a626df507c5eb8a88f416e919dfe7a9f73d47c606d34182a90a64e08b4279928a300bac664250368 SHA512 a1d337d50378604f28c275dc3192565a7b058ace04cfefa5b5cce7141873e88925b63750a9ba62e87e4b3e65f4c94875435674653836d8785c02b26f82a1ceb6
 DIST github.com-golang-appengine-v1.0.0.tar.gz 230886 BLAKE2B 1edb9998d1e7add28dd7f900874d1f2de83c9ae6bde94556dbe221e0077d665bd77f07bf7461eb5baaf5ce5bdbb765de41cb2412dbc618a4b475ff73c481c50f SHA512 0948582b3cf0520f0f2052aa04bda2409ee5f2f6d4781b95d208f2c6121bfe3383099ccf99f6c78ac90c6c35ae9e7dd7d0c317917daaa0e8bc7fe99f0b7d09b9
 DIST github.com-golang-crypto-8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9.tar.gz 1613170 BLAKE2B e151da61e2070a138d449767c1151be43b53b301daeba95935af2b871cf1216d76f764ccc43263947091c70120323dc50e34645013454f6cfc3bf8123497025b SHA512 c36a53920a68eb0157ca36aec22f32cb5a3fd43d777268dd834787ce941335472ad97f173db7ace7fd60a9a53235b684431d245d03d2de63b0a403e6b136f6d6
 DIST github.com-golang-net-1e491301e022f8f977054da4c2d852decd59571f.tar.gz 950358 BLAKE2B 7b5a47d00de2d3261d3031f8b1bcc15ca037dc320c0ecdd43b53d03202a8b4ff30b03906e322466177bb489e446c25b4dea6696bfea636fe68bad3ef85fed6c3 SHA512 adf4db073e376178fe180c98908c071be49919a87d9d5476407c4371ef397fcd469c20363f0133a856a8dbb2b1a54c9590029386079c88df72fc09effccd95d7
 DIST github.com-golang-oauth2-1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7.tar.gz 42533 BLAKE2B 7eb92ec84a084767aa43c89882c13bfdb4db437fe8354e430fb110f673816de9bfc219cb81c7d55d15fd7c3a08a1cccae8f539e115177e50598a0560170c8fe8 SHA512 9321bd14f949990ea9befcc9f5c0db5e5f7139eae7b498c36694bff1797e675d621f344992b472e021c06062363b47fcc61aa6492014af594bc9590e4db5f6ea
 DIST github.com-golang-sys-9527bec2660bd847c050fda93a0f0c6dee0800bb.tar.gz 972371 BLAKE2B a4814d48cf7356deef16c543150f8ba291ccd50c39542f8d218fca3c3569645c9dda938caa609b8daf8fe330f5758b9137ec5961b16eabf31d7a1c0d4753d4f7 SHA512 dc3279b4b85b90f3d1eed61cdc0c80b42d6306999bada8d68fdb4fbd6a4c30a9c9aa965b55429130d75d489f220a3bad06fa62ea716f461a0162b0400ca0ea62
-DIST github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz 195878 BLAKE2B 46e186bc1a3096dd043780a35a989959b2cbcabd063bd4bd671fb3b4536ecff731037c57479228badb438fb53bb0c21e8fbb1db881f1438be9bd2398a75c9455 SHA512 da15b3ff93cc1b26439b9e7acf3ae5a12e7d23c0d6e11c691c4013133d37b41d35275f8040a74fcd4f90a9ad93c0b95b48687de43e94831b699df60fbf0c5159
 DIST github.com-google-go-github-v15.0.0.tar.gz 195725 BLAKE2B c8a04c0bdf2f19874ee681d02ebe8fe69b02236f605a76aa639addf9f1d662515ced5e363896d388c01670a9117166a65ea91e04b4b1c9dab2e7ab7ca34e3731 SHA512 c05867feb415826713b0ba90b3a904f2429771f1ca769cd2b21ba616798177c42a35f72c69752d3f12562eb36243b25ef20794911735cbc74ad206abe548fb67
 DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
-DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz 28059 BLAKE2B e760c6976b7cf6bf4df46bc355eb1ecbd62795d65ddc8172f4ee727579a5848f1e202afe9fa1fd649ab52c417af8f0c8aa09a139904a57114214859206404028 SHA512 27931ff511b9ddca3ad0f21d648ac4652736907366136d8e0282a89acf4afb589821aee0362166a8df2de2cbd6b20edf13c13d2686e6e5f9ea2d773e6e507b36
-DIST github.com-jroimartin-gocui-c055c87ae801372cd74a0839b972db4f7697ae5f.tar.gz 28382 BLAKE2B c54e8fae44035a4da89823265c34315940597682c2fff9ecef0ea0f6c00a8b9b885e189277b897205425df9546d2ab6883f209a52ed792def417aff87975a24c SHA512 4edeb6e7103ca7bcb79de26f3c09aa8b92b7d5190719eaea2e0929a40d70ff97953fe405d300eacde70493301439025f5bfae5850257cd9e95619cc90dd4bf76
 DIST github.com-jroimartin-gocui-v0.4.0.tar.gz 28376 BLAKE2B 00775b321258c59d031adadb3f56a553c194e113138490b6ca75320c8b5fe685b89ffee046cc87f5e73c5c6826bfa7f4c22e208066e87e755a421f9939b88b41 SHA512 47cd84a3383bb18e22532c022d1730dfafc69d978f57e1402bd8057be91e810a13783675efb7fd29fc7e68a91284554d643f0efe923f9ff32c63582371454db0
-DIST github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz 7598 BLAKE2B 21a5b6e25859f38416a185646e3d63cb7fc2d175f816ba71b924a80a939fdd47af5be8eec35146703822e1eaa91a3a2f41123eba475f678cd0206b597b879189 SHA512 47f401a01ecc8d08504bb8da3164b95c814ff567d9d44dcdd8aed7dcc2768e4aae0b65504f15931a20c3ec6bd9873383e2b1150660a7ae5016dc1d389305a0f9
 DIST github.com-mattn-go-colorable-v0.0.9.tar.gz 7593 BLAKE2B ce0e8b4ea658b41da2f1bf38eb5eef108393e672792adef98baa56a5885508766ed0cec4041f2cbcd8baf20d03a967c3d62d539a9bb07a0b90651123a3f3a647 SHA512 59be33ee1ff5f2410f57421f4af21dbd85d0b48e3070a4179c016eee1fd9017ff83058eca2b0e31a5af725ae48b794b49ade37a5cf5ab0a1954606eb52bd06b6
-DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
 DIST github.com-mattn-go-isatty-v0.0.3.tar.gz 3364 BLAKE2B 1df33a5e546b1e9be70dc6eba5f91b31ded363602b9cce856773e7db5d8fbe16c39a44bc4240f2c82ccfa173ec56544f2b5f408404d5fd4beb70ad2cfb174286 SHA512 60afa46beefe482bb13ab9dd0b94c45719a91d7f5d98f87452154636b520648fd900961b0df2bb3170bf42cdb62635073cfc48f923639aa2391ddccd6382fb1d
-DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
 DIST github.com-mattn-go-runewidth-v0.0.2.tar.gz 22367 BLAKE2B 9e98e1c6b042e6e11023be3a3d64c24f56d47ceb70670e6d9a3df967496fe5c964674598c07987b90e58485f0c4722a6dc13c06449b51bfac32fc7349c20eb5b SHA512 fc76cafb03e6dbf28c8208070293ed64173a85b62dbb768d288e050cc1e41db63263f1f5322bbddc233d545143bda8f00ca3ae1668810e8ce2919ed5ee6aae2f
 DIST github.com-nsf-termbox-go-21a4d435a86280a2927985fd6296de56cbce453e.tar.gz 31588 BLAKE2B f29b919f24be6b3e7abb733c7bb97270ade14fc7b6c500b84bafc8c289aed835a2d37181e1ea0381d5aa7659bfa2a407f4baf90f9d635162bb4319eeba758955 SHA512 c2370a310eacbf50a11263b10a005bc9ee95e25c2bd3f17f87d8e407562ceec4b6bb6fbba039f89afd32d5538a96b72570c6e93719d4878fd66e95addedcaf27
-DIST github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz 31339 BLAKE2B 38224fa7af5e8e56500fc01f3e861aeae2e81b4cc38859d9598b0883ccde7504f1f717a73db4a76c4ea4baa5f052fb5b7f39413aa8be9e5cde5b70d8693f2044 SHA512 f53f34059016336cdf2d061594b50ce5a3bad9a9a97158218342e245c277ae68571647fe00bf207274a8714ce103a536ff80b820feaefb44cbd12abc5debdd47
-DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443
-DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
-DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
-DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
-DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-spf13-pflag-v1.0.1.tar.gz 43244 BLAKE2B 7391fc9b28285d28fec041634ece2cad5ee54a2b46979772fb3d1b42888fbdea1624444c3618938083539b0af05eb5985b74881f37ff81baca99881ba3ca0226 SHA512 e09066442bd7c98b3a3c2de815d89ce27d97ccec242e1e47ff38e4f8ece442657573bddab5bd560f644f62304ca6bdca3b4e002ebc330b78e69a96eccd8e778b
-DIST github.com-xanzy-go-gitlab-26ea551e8c159cea42a9f206bc18ae5884d44d0c.tar.gz 80968 BLAKE2B c6673c8c0cb4b5ed5c2d85c934ec3095d11d14d73e84acdbd3e3f1a5ebab36ca49d472b1040297e248c55e2843c01ed05aabc21b8b94758a799c48bd8558af01 SHA512 1b8c48a35ae0a3d64f2fc04b1705afbaa9fb45ff00e6a755afe3dbb915dcb2e3e60f4cd9168a82ab03a3615833f94d311a1910429a7b91b7e67f8115334b3192
 DIST github.com-xanzy-go-gitlab-v0.10.5.tar.gz 80919 BLAKE2B c1aba2dfa8d22e508f361f1a91a2062c23e95d0e24201da12188ec226ca2bb831df996c25fd8ab8a11c66c9bfecfc6d5246eafd9f1933da342483a51938d0ced SHA512 31baafbb9d9e34619b0f050661fcb770e1503569f48bcad15de474992737a6071bd64c6de8f776d7a62fed8bd3fd6f2d759cb6e2094b498df49946f6a69df518
-DIST pet-0.3.0.tar.gz 2735876 BLAKE2B c2b629db202c263b7419e79e15e07b808ea2a395030ef79214c541ac0d17a9fbe9cf3db9bc7e1a886da38ff8becd06d18abc24a69131cf6e3009ee2d72b1e6db SHA512 deb0323fbcd0195df9638bd82077a55be6554d80c44ddbb08cbb63c2a055659f5aa42fd87bc498d5cb0c93d57047f48462ec428ebff3d89a80dcd4b3661447fc
-DIST pet-0.3.2.tar.gz 2737547 BLAKE2B dff3c20539e910a06840fda95cae9214f4e846d503454c3d98a46dd0756dc709d7055f52b58dce057b4513470a19ce4542c3b2af35f4492dc544366a44e6f311 SHA512 b8abef80a7dd52b0143638dc12686f519b76b326c0cfb487423011e54fe536a83f9994c238854e42652138ea4b0ed1dfb37c59af37e329424c01186da74ed910
 DIST pet-0.3.6.tar.gz 2739396 BLAKE2B 16fd9cd2e80d742b7f56819318f709ebe40902e9096c4b5f11b4dfb5341c78b491e70b1d5e6ff81d758413b9b2276e9bd87e99eb320592a70f93a2c75c805892 SHA512 366eabd93865ac72f9d251d51393ba9ad5904195d40f26da80a371d6d2183b5e81156930b137b1551ef2bd372cbf235847dd8a7ac8c7d4584c9d326325d30f79
-EBUILD pet-0.3.0.ebuild 2395 BLAKE2B 14242ea9d476ed4a85449936791e0e0d0af988d5d89cbfdc3a19a1851d15bd6c52176b2fb9139159a37a2b41aa22a66abd8b1abe0668b160df0c765f4c705d7f SHA512 3df3d1946518f488d784c815e0b402945fbbce84edb232e2740c7f110dc10ad730e87bf981b74ce4848f8537de9e8a2c5af6fce15c4130bff5630ee4412bce2d
-EBUILD pet-0.3.2.ebuild 2468 BLAKE2B 3370cf338041c16074423063d5acb1f3b70fdd6dbb0c5c563087d65280685e01d5b20649ddd79f61dcb7752441b44663b6dc98631a16f48fa90f9405b47a18ac SHA512 dafcf625d9352415aaf10921404d01ad268007559ec0ea8737228792c9b91ce97daf73b11235e493d031bac1c234c7cff77787f6ee0bdab0946a844176c5cc43
-EBUILD pet-0.3.6.ebuild 2161 BLAKE2B 27e6601c367baae228a509496104526b20bcc34d6cdd6dc68317162887892467b6ad64938e0ed6c1ca3f202b4007b033262a776e756c29aefa855ddbff7be438 SHA512 f0edb6c6632a521a40b6e53f86c98cb9177bc1f2152276f7dd99927cdde39aeeac6454615d276c1460363d725d9de5f5abf9512498c53126a7445cd7a333245b
+EBUILD pet-0.3.6.ebuild 2187 BLAKE2B 33d1a5bd6b0f91b61d8fc8cc1d134779d00c110d9db3aa5ddd2cb6f2313102240df92f641b2a2e68161caded82cc0966401455a6f5c96b9863d3eef7c0242036 SHA512 a9c7c81679ccb929df74f4798452eb878789d533a6eef216ac573354de9ade71ec0261ef463f27cc5c5a9212330c086f1a949872f7fa391e19bbb6efcb0719b7
 MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/pet-0.3.0.ebuild b/app-misc/pet/pet-0.3.0.ebuild
deleted file mode 100644
index c5dbeeae6fa0..000000000000
--- a/app-misc/pet/pet-0.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
-	"github.com/chzyer/readline f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f"
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jroimartin/gocui 4f518eddb04b8f73870836b6d1941e8aa3c06637"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
-	"github.com/nsf/termbox-go 88b7b944be8bc8d8ec6195fca97c5869ba20f99d"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-	"golang.org/x/crypto 8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9 github.com/golang/crypto"
-	"golang.org/x/net 1e491301e022f8f977054da4c2d852decd59571f github.com/golang/net"
-	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
-	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
-	"google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine" )
-
-EGO_PN="github.com/knqyf263/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Simple command-line snippet manager"
-HOMEPAGE="https://github.com/knqyf263/pet"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-# dev-go/toml doesn't provide sources
-RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
-
-src_install() {
-	dobin pet
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version app-shells/peco ; then
-		einfo "You should consider to install app-shells/peco"
-		einfo "to be able to use selector command"
-	fi
-}
diff --git a/app-misc/pet/pet-0.3.2.ebuild b/app-misc/pet/pet-0.3.2.ebuild
deleted file mode 100644
index d2db02c96642..000000000000
--- a/app-misc/pet/pet-0.3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
-	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
-	"github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-	"github.com/google/go-github e48060a28fac52d0f1cb758bc8b87c07bac4a87d"
-	"github.com/xanzy/go-gitlab 26ea551e8c159cea42a9f206bc18ae5884d44d0c"
-	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jroimartin/gocui c055c87ae801372cd74a0839b972db4f7697ae5f"
-	"github.com/mattn/go-colorable 167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
-	"github.com/nsf/termbox-go 21a4d435a86280a2927985fd6296de56cbce453e"
-	"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-	"github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2d122ef517385"
-	"github.com/spf13/pflag 583c0c0531f06d5278b7d917446061adc344b5cd"
-	"golang.org/x/crypto 8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9 github.com/golang/crypto"
-	"golang.org/x/net 1e491301e022f8f977054da4c2d852decd59571f github.com/golang/net"
-	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
-	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
-	"google.golang.org/appengine 150dc57a1b433e64154302bdc40b6bb8aefa313a github.com/golang/appengine"
-)
-
-EGO_PN="github.com/knqyf263/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Simple command-line snippet manager"
-HOMEPAGE="https://github.com/knqyf263/pet"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-# dev-go/toml doesn't provide sources
-RDEPEND="
-	zsh-completion? ( app-shells/zsh-completions )"
-
-src_install() {
-	dobin pet
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins src/github.com/knqyf263/pet/misc/completions/zsh/_pet
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version app-shells/peco ; then
-		einfo "You should consider to install app-shells/peco"
-		einfo "to be able to use selector command"
-	fi
-}
diff --git a/app-misc/pet/pet-0.3.6.ebuild b/app-misc/pet/pet-0.3.6.ebuild
index 062b5a0ad444..d39d9096873e 100644
--- a/app-misc/pet/pet-0.3.6.ebuild
+++ b/app-misc/pet/pet-0.3.6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-EGO_VENDOR=(
-	"github.com/BurntSushi/toml v0.3.0"
+EGO_VENDOR=( "github.com/BurntSushi/toml v0.3.0"
 	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
 	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
 	"github.com/fatih/color v1.7.0"
@@ -24,8 +23,7 @@ EGO_VENDOR=(
 	"golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
 	"golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
 	"github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
-	"google.golang.org/appengine v1.0.0 github.com/golang/appengine"
-)
+	"google.golang.org/appengine v1.0.0 github.com/golang/appengine" )
 
 EGO_PN="github.com/knqyf263/${PN}"
 
@@ -36,24 +34,25 @@ HOMEPAGE="https://github.com/knqyf263/pet"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="zsh-completion"
 
 RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
-S=${WORKDIR}/${P}/src/${EGO_PN}
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 src_compile() {
 	export -n GOCACHE XDG_CACHE_HOME
 	GOPATH="${WORKDIR}/${P}" GO111MODULE=on \
-		go build -mod=vendor -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+		go build -mod=vendor -v -work -x "${EGO_BUILD_FLAGS}" "${EGO_PN}" || die
 }
 
 src_install() {
 	dobin pet
 
-	if use zsh-completion; then
+	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins misc/completions/zsh/_pet
 	fi
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 685dd4786d12..6378f00939ff 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,3 +1,3 @@
 DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
-EBUILD physlock-11-r1.ebuild 553 BLAKE2B 93be1c05c828d028f2176e32fac1723cbd065e6cf25c19c49eb9509bf3794e7310beaaebf0555f9087d818a7e9386a0de8f9bebe715f4a3c9492322a2b2c7080 SHA512 64d965a8fa93986b39ad74e313c4963bcaa342b7ac758532760db10de1375d2886b5f98dd43d19e7912fa6d93b5de8dacfe93e49de913ddcb0fe9e8757b68215
+EBUILD physlock-11-r1.ebuild 551 BLAKE2B 50d5ea880dc464903a6d60a18a773eb0286d78923533624dda8c5db954c8b2b6ab3b587e41c3d0231d2cc842684d4c6d143989548a83318045c8e9395bb5566b SHA512 a7bebe09db65ef32be5af4bb73619d8b45dd142cf7d940f77144873b95ea3004536fe15c565c57f3ab711924a778ffaeef50992ec6fb9ee45577890e012fd353
 MISC metadata.xml 757 BLAKE2B 91000aca8e366f965b46d72494b23734db9d5866c41f2f364755b9bf1397ce673ae96a8c182ee732ca3b05fae863cb8caaf61478f708df33ad3fe21e246b4af4 SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625
diff --git a/app-misc/physlock/physlock-11-r1.ebuild b/app-misc/physlock/physlock-11-r1.ebuild
index 761fce5332c0..06539301bfe6 100644
--- a/app-misc/physlock/physlock-11-r1.ebuild
+++ b/app-misc/physlock/physlock-11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-RDEPEND="virtual/pam"
+RDEPEND="sys-libs/pam"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
deleted file mode 100644
index 3dadadd9230f..000000000000
--- a/app-misc/pip3line/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
-EBUILD pip3line-3.6.0.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
-EBUILD pip3line-9999.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
-MISC metadata.xml 403 BLAKE2B ffbabd34f0ade6f1c61c98779163c17893dc50c58ab8c1712c6aa36dca531fe346f77d5eb9d6097c53aa0774ce8a8662b477f5c7f06cbdb1b6d99b1ec644103e SHA512 79486243bb6d993f9aaf2ad4b4b2f113d4b88ca5cfad18bf877ef0bc1422d4fb4dac65d5fdcecea3535776255d219e783c5767e16eb45c6109b7441b61c79a12
diff --git a/app-misc/pip3line/metadata.xml b/app-misc/pip3line/metadata.xml
deleted file mode 100644
index a89190752a47..000000000000
--- a/app-misc/pip3line/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<use>
-		<flag name='distorm'>Compile the Distorm plugin</flag>
-		<flag name='qscintilla'>Use QScintilla for more efficient text display</flag>
-		<flag name='ssl'>Compile the plugin adding miscellaneous hashes from OpenSSL</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/pip3line/pip3line-3.6.0.ebuild b/app-misc/pip3line/pip3line-3.6.0.ebuild
deleted file mode 100644
index 6bc81c630244..000000000000
--- a/app-misc/pip3line/pip3line-3.6.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
-HOMEPAGE="https://github.com/metrodango/pip3line"
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# A few comments
-# the ssl flag is just there to enable the plugin for low level crypto algorithms.
-# It has nothing to do with the SSL/TLS protocol itself.
-
-IUSE="distorm python qscintilla ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	qscintilla? ( x11-libs/qscintilla )
-	ssl? ( dev-libs/openssl:0= )"
-
-DEPEND="${RDEPEND}
-	distorm? ( dev-vcs/git )"
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DBASIC=yes
-		-DWITH_DISTORM=$(usex distorm)
-		-DWITH_OPENSSL=$(usex ssl)
-		-DWITH_SCINTILLA=$(usex qscintilla)
-	)
-
-	# distorm is statically linked, due to insufficiencies
-	# in the current distorm64 package
-
-	if use distorm; then
-		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
-	fi
-
-	if use python; then
-		local targets=( ${PYTHON_TARGETS} )
-		for target in ${targets[@]}; do
-			if python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON3=ON
-					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-		for target in ${targets[@]}; do
-			if ! python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON27=ON
-					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pip3line/pip3line-9999.ebuild b/app-misc/pip3line/pip3line-9999.ebuild
deleted file mode 100644
index 6bc81c630244..000000000000
--- a/app-misc/pip3line/pip3line-9999.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
-HOMEPAGE="https://github.com/metrodango/pip3line"
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# A few comments
-# the ssl flag is just there to enable the plugin for low level crypto algorithms.
-# It has nothing to do with the SSL/TLS protocol itself.
-
-IUSE="distorm python qscintilla ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	qscintilla? ( x11-libs/qscintilla )
-	ssl? ( dev-libs/openssl:0= )"
-
-DEPEND="${RDEPEND}
-	distorm? ( dev-vcs/git )"
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DBASIC=yes
-		-DWITH_DISTORM=$(usex distorm)
-		-DWITH_OPENSSL=$(usex ssl)
-		-DWITH_SCINTILLA=$(usex qscintilla)
-	)
-
-	# distorm is statically linked, due to insufficiencies
-	# in the current distorm64 package
-
-	if use distorm; then
-		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
-	fi
-
-	if use python; then
-		local targets=( ${PYTHON_TARGETS} )
-		for target in ${targets[@]}; do
-			if python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON3=ON
-					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-		for target in ${targets[@]}; do
-			if ! python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON27=ON
-					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/app-misc/ps3pf_utils/Manifest b/app-misc/ps3pf_utils/Manifest
index 062d49ba4778..c41d17a2753e 100644
--- a/app-misc/ps3pf_utils/Manifest
+++ b/app-misc/ps3pf_utils/Manifest
@@ -1,3 +1,3 @@
 DIST ps3-utils-2.3.tar.bz2 351066 BLAKE2B 2168e6f2d0eb2543ee8efdf6092d9dd21d2bad38ad8459b19b9a2b4bbcc05874cb99768b6d2f090a5866b904c4a0fd5c590eb6ebc431f87fd3686d8a6fcc4adf SHA512 523e8c28325dc77478cc910a62249bfcd29b35b50e9b01d0d6dec600af302a4a3eff532b313d82fb23c4ff5436955629d8a72f1afb03b76f2b1b9cbd534e8396
-EBUILD ps3pf_utils-2.3.ebuild 571 BLAKE2B 5cac13fc988e7fe1f3476a77a0055e7592b54cfe80d04d438e08436d8d1bcdb454529bcb73c31f6427b1b3219db98a08bb9662a48a882e4827a3499320afd760 SHA512 c4718000f4b3a8174279d79746ea0c269de6867e962c0824ec5901c6686213496f6528df407be0cd7d6c3b193c823389e5d66128c899cf30a63c7f22cc532e31
+EBUILD ps3pf_utils-2.3.ebuild 582 BLAKE2B c4c9b05c8a5f67aca7e6bc9ea973ebdfa99b300a905d42825d0636912ea6c1834deaecb955c53e2ab0e1dc16085581eb6cc5383837de7ddb047db97fed4eadd3 SHA512 743fe158f7283530156be5547f10ce95692af44f3b6b5164e67739346a5b76cd0d85ea6f73e393a39e04a158b4b8aa62707ab91774de1524b31daf1ab7393788
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
index f077de454c08..3c10f438ef07 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic
 
 DESCRIPTION="Utilities to set the ps3 specific features"
 HOMEPAGE="http://www.playstation.com/ps3-openplatform/index.html"
-SRC_URI="mirror://kernel/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-${PV}.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ps3-utils-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index edf2d9ed7be9..aeb6a3072494 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,5 +1,5 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 DIST remind-03.01.16.tar.gz 354521 BLAKE2B b4157922842af67408423e1b36ddae8f049e9c803cec83a7a11188dff5ccf7934ce5afc776bdc02acd6b18a8ad172180841a53576220791fb64230a0e1d54884 SHA512 61d72b01315d59a0e6f96006d5cb063752efad68119e2d1c4fcf6e6f3b2c122a7df47081c305f777fb2c6574e278e401446192897e48b4f93607db29db046550
-EBUILD remind-03.01.15.ebuild 984 BLAKE2B d55ab74017d25ab206d36400fa1c98c19ed92f24e7735475a0caa7baf74935adceab7606436aed81f7bb6711e7422a15f4dc72a4cff8caed8ba7aa44336637d5 SHA512 ccb506515eb89d8e29208e2a24f983d95f091f379c84c42a965f66422abcc09652be5585090477af8cd8ffc917e91d0fed976637b3bb17e1ba8ded2a045844e1
-EBUILD remind-03.01.16.ebuild 964 BLAKE2B 11a44fd1c0b66530eb9f31f838115b0ccf7a5f22529c472e6bb7622edb60ae67a068499991ccee7f33d62e10032f2d609fc67a1462dd10bef011dfd0cd9f9831 SHA512 41463f646e9b1ccd219335ca336803af7e9bcf7ea8ec58af5dded03be22cd902187f64fab0613ff66e7a0528438c68c709efb8829c9a5db93ddbb3c3cc3ada91
+EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
+EBUILD remind-03.01.16.ebuild 954 BLAKE2B 8b33095cd29132b456850635a0aa0f84c727560c195fb2a25b0caed13c79b0172d51ccc51b2ed8aeb94d11ab16397b7e7943b0f14176eb6f79691b1f73a4b861 SHA512 6df5047af1b03dde5f0f850858d0f12c418f2c1efd25449f651f1e8a20909f5fcb60027fbfd276d21647a85fbca62e7520313a5449d930c1d3f7c8e2ed6bc1f1
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/app-misc/remind/remind-03.01.15.ebuild b/app-misc/remind/remind-03.01.15.ebuild
index a1ad5d91383c..e15d88ebfec2 100644
--- a/app-misc/remind/remind-03.01.15.ebuild
+++ b/app-misc/remind/remind-03.01.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="tk"
 
 RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
diff --git a/app-misc/remind/remind-03.01.16.ebuild b/app-misc/remind/remind-03.01.16.ebuild
index cff1e298f1fa..f63a17d39ff7 100644
--- a/app-misc/remind/remind-03.01.16.ebuild
+++ b/app-misc/remind/remind-03.01.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 74eeb57e3494..60331b18fcf0 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -8,11 +8,13 @@ DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f22
 DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
-EBUILD screen-4.4.0.ebuild 3969 BLAKE2B 9777dcbd9eaadba0a16fc019e5af58740eb10181bb62f06d1520dde8d9f7ba9a285514c8d60e740f8c8ead0a677cbf21730bddf33e88aa5ad03570fcbe369cd2 SHA512 9802726e92c72416a3710c6d5988e9d2a136e2db8147784723228ac81d27492160ac738ddc5e6d75eaba5af4e6e23e1eb0f4d06d88199f4d04afe0e44fed0a39
-EBUILD screen-4.5.1.ebuild 4116 BLAKE2B 46e39151346890b58663aa75b214a99b96bbfb06bdf9c03cf3c8f99aeea7cf38659fc14e8412bedbab3f32e2c2bdbf70a89cecd1f9708e451b904bfdfde7dc93 SHA512 5b674abdaf9001196c0190359254718f87902cc05b2170a51a3bcca2d5f7c654d78cd98945f3bf15e4374f8c32a4b800f971b3ed4079247d032e39d595c92cea
-EBUILD screen-4.6.0.ebuild 4064 BLAKE2B 6091efb4d2f52bd5c2e128623b86e9ba731afba4e850118225fa8b911814b1e68f3882464a6d29d26effc3067d2417a649db4b4791322e5b122ea26b50e230b0 SHA512 72ccce15b6b5c9407ae311ba6308b03f88eecba8b88b160a1b02430f45e4154754c1c9682e456afda2ed08ff204f60b74668f28db3c8eac33c0576d73c4630a0
-EBUILD screen-4.6.1.ebuild 4167 BLAKE2B 8e05fde741adaaaab0d3aa8a67a5da5d9d9a074ef761790ea23922771e3661ef5863dbaaefc594e7642fc084008f5fd17fc5ab5b0988788aaa3216cd7bcddbee SHA512 9c5688deee107cf15df84b363f783754b4cb4e5e57bf1f362597cdbf04238086a92b68d9e9b1e31e245220df8f6e2ec28919316dc845b56efc50035a771b1fc9
-EBUILD screen-4.6.2-r1.ebuild 4215 BLAKE2B 73e4c692b3f9434eef54feb71b1d162a689821c20ce19f4a36312737b92f273278e9c4e8fbdb6322cb57a88a3d4132145302fed8b47d9b3f1c3688c0bb0b5f89 SHA512 fb99d0723356ea2c8dfdd2ff77a345322ba41aa8bd05064441bfa8da3f1e1e9c609d2a9816f781b88deb77bd478f65efc7a946ac388b5327cf1ca2ceae216fe2
-EBUILD screen-4.6.2.ebuild 4216 BLAKE2B cba3196d9686f6141b748ce488da66b15cf2a238df269f296e906a5b0f4757e5c68596e3d709ccf5c4608026e796fa8b0dfb652cc7bf2aae313145b315ce10ec SHA512 768286ed5deb2c591d1a1c221f5a66f372915dbefdb17d1c2f3a2a6859e7b309010eba036334b541313bf6769ca3669fdc22c9013869a6e3a0380ccb743d2d29
-EBUILD screen-9999.ebuild 3993 BLAKE2B 0038fb3524378b7c672630820a2be775b5dfb83078af2e15bac10c03e31b518fc2d080be04fbb522afe5c7b3f4bc862d2e70e151be2e44f019614c5080a407ef SHA512 33e579357624287f8646469ad04aaff1049988b7affdf82b2e3511d76401ab9007f6554d7fa905c5c3df4095ff4bc2981cb6387cd939f3308ad6d5778e8300ab
+DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
+EBUILD screen-4.4.0.ebuild 3957 BLAKE2B c1de4c18ffbb612914c015b06b155576222638aefc103e27816b43589f4e993069ec72b18be7c1f9a1db3c95cc518286d611bd8dcbd4cb20fa21e8f4c5ec2bd5 SHA512 9560f54247cc9af7b76012cb0028142f9b6052bec5a78b0ff2488490760c68a4e7feb366963e9fc821efc85db5300630ad73295630523c7f89821eb696dffa2d
+EBUILD screen-4.5.1.ebuild 4104 BLAKE2B 7315316224044a673dcf0d6c9d467e62d1cf2f729c5fbcea612f3a50096112141546506b020537e3a96ab766550d7cc65e73ad08cb6cb68d3a6064add9f65f9c SHA512 08f1eea6126c4f9b818a60e28139df7a7d16aa7fad52019d08e8e48be2c5d8ffc4a1e43347fe1881fa9953176f59ab95d510fafe94ffaf32385306b0abab2249
+EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c647444a724f99040f6730278fad5e86eadb7b79b6b1af7a9e4ab414e213525c59ba76d303238b170b370ed29a3d98 SHA512 d04600a469600dcfa8eb5f7bd4ddb6f0847bd84e3221743e36af22bb1d60246fecd51b74f06929442d47d28895260543a7fb6efca420ff1c22f95ea23eac0ef7
+EBUILD screen-4.6.1.ebuild 4158 BLAKE2B e5337959d9c8d2559e448071baf510e55eb1e2696aa18c4b4c7d79defd03cffab88fa8a7e567b6af770393f14d1c3df651e633d7905386a5583d5129c4cf8d50 SHA512 e5017e0e8d4bd1022e1783820d8ceea4e4d7b8e63f4be3753c4111d309a82ff4e1dc8e159916486ff45a449ece052ec9acc1c83d36828fd201b6a3e73780c788
+EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
+EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
+EBUILD screen-4.7.0.ebuild 4206 BLAKE2B e3572233ea5865e0f4765e0ba51e7edd63e2c9ab77c4f5c44e2268a8be049156edca873ff00fb8ea1deb97b2e8525e64768fdbcb8c8ddc088e654d4f32010a98 SHA512 24bf75dcc7c41dba4508ef758bbd2af57126ddd53f87b9e254b18ae4bebb795adc9fdfecc0f3b7502db7a6a49ba845df28badd0efbc25e0d27f14569bde1c0da
+EBUILD screen-9999.ebuild 3984 BLAKE2B 6f68715e21470703626383ba4eee1871584b6dde2fa5dfa3e9cfae86ba8c7e3ce0496eecc2ecf4a091c53f19e1ea026547269a78b0e223805933d35ea7a692a4 SHA512 99f171c2963978b3a20a3c0637959a7fd0949163dcaf5a8693d8b9bd1a02a588d1d5c9ca16edf97724c2a2cbb6875caeaa8cd40c3988978dcf241f8c7a8ede87
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index 96aee0b52ce1..b6023c4e5928 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,12 +11,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
index 15a08cdceae5..f5c5c519dea8 100644
--- a/app-misc/screen/screen-4.5.1.ebuild
+++ b/app-misc/screen/screen-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
@@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
index d7051cd5f325..3e1c3a55ab8c 100644
--- a/app-misc/screen/screen-4.6.0.ebuild
+++ b/app-misc/screen/screen-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
@@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index ee99e929f824..b4fad2505ebd 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
@@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
index 7d14914a8680..d7aa2d425487 100644
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
@@ -24,7 +24,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
index 74566a73346f..245a4135f542 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
@@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
new file mode 100644
index 000000000000..bdc40e9094d1
--- /dev/null
+++ b/app-misc/screen/screen-4.7.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs user
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( sys-libs/pam )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+)
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 \
+		|| die
+
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/tmp/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	emake DESTDIR="${D}" SCREEN=screen-${PV} install
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT%/}/tmp/screen"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 3bf613acb96f..29951514a764 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
@@ -24,7 +24,7 @@ IUSE="debug nethack pam selinux multiuser utmp"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
 	utmp? (
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index c6340fea67ae..fd090dbf53dc 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,4 @@
 AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
 DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
-EBUILD screenie-1.30.0-r1.ebuild 537 BLAKE2B 59e03a7925ea5ae22b3bfa3c4f8c915a804137a35b75e5e5c8fbb621c13856805bdc9383670a602e609d5ae5d5f9f8dbe5ba874eaa5cc8dc0535fc4b0f3a10dd SHA512 6cb6a54c1dde75c1d1fb186e4f9f052ae8b0a0d692304005758bfe7197c2b03432692091e75d1fc42a4468700fef1bd7935322ccf10b0ff41978c067f5fe41c0
+EBUILD screenie-1.30.0-r1.ebuild 527 BLAKE2B 6b8c4019e879c9906de2baab723389270b6a9535ae33d9e485cd408ba2e192c516c6f6d862d04bac2648cb686d90f478ad3d0c71dce24cf93afebc04deaeb6a2 SHA512 122cc74433593a8307a26d3d43e0e21eebd4e8804f4e01e0f3f522987502227ad032a984f2fdd19477df73f609da224f4dd252be1f31d8e6a449f3cf0aa4c5b7
 MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
index 24d0adb2af8f..8bfdb47624bf 100644
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://pubwww.hsz-t.ch/~mgloor/data/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ia64 sparc x86"
 IUSE=""
 
 RDEPEND="app-misc/screen"
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 1a9ffa3f5e17..0102c0850b22 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 881 BLAKE2B 1a6b15f9fac397f14656b2f03ed0bae9c67993c135fe516346912091ac94446cd504fdd32f9baff58d085e4521957fe2d6f39fbc0227e0d201ebd30821dbf2c5 SHA512 527ea26d67b11ce6f18231aa321a69967427e598f5780f7717c55c10802dd087fb9291ba68a4d9e63932a23906776163da267162d700a661cb0db4c04ec79d01
+EBUILD sl-5.02.ebuild 871 BLAKE2B d3d25fb93dd19037f652a7c1d6d873977e4f94fae0a77dbca31885d68028e4305f00636c190033e40cebf071d5b7681128df0484e0140db0645d4a87ff51ae71 SHA512 362fc09094f8f72b5bcbad651d9123b253a96a71c282c2c2c40bec5d94d622ef4db41857d2f4e65a09e145ed96bd6376ad521f8224a7e4ed9de8e188c6eecef5
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 0ec822115ca5..6a44c8392318 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index a5a240ef47d1..0025c4fa4652 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -4,14 +4,10 @@ DIST tmux-2.8.tar.gz 491195 BLAKE2B 1dde20282f84a32647ebb26cdd2346f8870670f904cb
 DIST tmux-2.9.tar.gz 510966 BLAKE2B 63d4fe671afc00792eae4358c0833854cb5202a4f9aab6deaec9f3f459b0786d2d966294478ab2015a8d8d88d1815385422e1bd311d9211f88e130762fe4b770 SHA512 a712da19ebea240bafb3e8b0bf313baec6f2e6c6e32babac1221a0fbaaf4da82cd8cad4e6cf3da1e277ddc830b5405d104ca69b278627d3db5d0e4439d4896b3
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966a5fdcd3f1d47963be41325dbeac03c96c412db05327498d93f8e511a0ebd933341591566474919d54453336 SHA512 8021c387bff7c3a99adb2a21fd4e72444513b4db63d87ec72242884b407561a257e99c805988da75ca91b3258a9ab61d3b84a6bf0a1f7671932eb20a7908d4f4
-EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd
-EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367
-EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
-<<<<<<< HEAD
-EBUILD tmux-2.9a.ebuild 2333 BLAKE2B fda293b0602c650578d92e5065270abbffaab9d000102535cf6cb87d037c8e3e0413be21ca9549caf44f2ec99bfb4e0452ff486c14c40625cd3c3ee454b1c4fa SHA512 7dc539a60549466a9610ae9a4d7bbea39c15e2ec2f357c906fb67becfeb83f19c88088afd01463b08f87ac26e8f9d485d69f4474ab98c262c688c398883bcd6e
-=======
-EBUILD tmux-2.9a.ebuild 2329 BLAKE2B 1ac85f5bead7092439982379dd11b67a238eed8b190ec0ebd8ad5a857a70d2e845102a8aa0ecad551557c0704eb3343ab494ea655ee2e9faf73184c8da0cf2ff SHA512 510677dd9dfdc8a12e642a52d13f88175067cadabdacda81eff66c7d126392cca84d579afdffd90c2ab99f6b50fc51fe39144cde34f00850db1f0f2695c2fbb1
->>>>>>> next
-EBUILD tmux-9999.ebuild 2338 BLAKE2B b69396cad7f3e80f248ebcf1e25e96ae5d6f785aab57a8c8c3879ce3646cad3b4a1038631a9c94e5cff1379b7832832f45e4bd18e3d2fe87263c0323a90ddb9a SHA512 739f8a9ef385410fffd0fa9ec3fbb9c6277a37890e3f3cc2e3fa5e314b03d0303673d8778aa34546c08e12ea271b6fe83b763b3d8aa2835b860049c0df561698
+EBUILD tmux-2.7-r1.ebuild 2095 BLAKE2B 312426a0dd7859592493317b0e0d04d06d3737a45d96ec0ba55e46c91942e22facfb66fe3ae290e1939ac99977aad5c87bf798c8aca6bb119bb046aaadcc6e53 SHA512 03627b68d2ffa155a910c7c4f2160d370aacafe2deffd9cca82c6031bfda10d6194f8bce7f4885f56908e55ef4ffe5e13dd4fa21f1e86a92d82ba6b5e8cb31fc
+EBUILD tmux-2.7.ebuild 2116 BLAKE2B 6f4506f20999fff4c87989a8e1a74d83791108a22dcf68693a84654d41a2764e029931bc9e779cd2c59354533d53d7da0ef9cfec1673f3b6ae33850c44c28076 SHA512 2c757e1c617758b401fbf6df06c740d4bdfc513b7dfa45b12c31c29e2461538c0b85e0056dc0377fafeb8cafce94533b9e2558f7ae7245d24f54dc62d41eaade
+EBUILD tmux-2.8-r2.ebuild 1977 BLAKE2B 747a0698a1c703de04b84aeefc9d8a8e4bdd167577d65505a91945d1bc7bcaaff570b6f69fa51578c1b56059012800d315efc3989343596d17e9658b23a1e6fb SHA512 86c1a5141c46daaa5272399e0ffe9be4ce29fcfe6f25f149bb1e73c17441ae3d717346907c05c23bdbb92d221fb301f6695cbb46b9758adbaee8d8020af0171f
+EBUILD tmux-2.9.ebuild 2321 BLAKE2B 339f8e6e3ac494c37c1a751c2a1cf3fabb9d6d49cc4233ed02018dd5168133d4297cf014979385810b9f8ff0e8b18e3bbcc2c3a29bb0014e7b070e85f1cabd5d SHA512 26a41df6ec0798ede92dca4dcfc5c400f7d2ff8f6cc625fe9bad87f57692470261cf309b8bbef058f3a36d83ad84a82a67186d784d1084a41af15ddbad4eaa77
+EBUILD tmux-2.9a.ebuild 2305 BLAKE2B 45fdd0930f9dc95f1a434eb2c9219b3173c0f4cd2f00a94dede83aa9fc355bdeda9a355b090e60ea0849e08867b98b018300f8401404fd5e358eb76963da420e SHA512 369603353bdebafd0371472e881f4c3fe90dabfb6b89ff02986930773c6caf5f6c781fcb008b1e8f67b0ce88fafa7e900aa75be2ff4cc1d13d66e127b8e62d74
+EBUILD tmux-9999.ebuild 2316 BLAKE2B af43a63f58a79848de0ec6f00e5a945fd463d225afae30d81ecb33766bfd0a2d111fafc363c05eb85076b3216e4956589c0062c3aedbe0f62370022036e44346 SHA512 f6097f8e6a66e9c5705a8f33f8fd0c9f02e9e584245d2318eeb971f5fede131361d2bfb690da2a5f300668edb2d6ccc84de17ed3ade83bb6f0b07c5eef1fcb43
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7-r1.ebuild b/app-misc/tmux/tmux-2.7-r1.ebuild
index 22c5ad91fd7e..ef0907a1e1e1 100644
--- a/app-misc/tmux/tmux-2.7-r1.ebuild
+++ b/app-misc/tmux/tmux-2.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index 42239f6e26cb..39e1657cbf22 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/tmux/tmux-2.8-r2.ebuild b/app-misc/tmux/tmux-2.8-r2.ebuild
index f858b8912073..97bfd21a51c8 100644
--- a/app-misc/tmux/tmux-2.8-r2.ebuild
+++ b/app-misc/tmux/tmux-2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 DEPEND="
diff --git a/app-misc/tmux/tmux-2.9.ebuild b/app-misc/tmux/tmux-2.9.ebuild
index 4615e5f5979c..636f5f18de21 100644
--- a/app-misc/tmux/tmux-2.9.ebuild
+++ b/app-misc/tmux/tmux-2.9.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index 4fa0176a67ac..9a6980c0acfe 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,11 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-<<<<<<< HEAD
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-=======
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
->>>>>>> next
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index f4e930c58362..0a214c32d460 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/toilet/Manifest b/app-misc/toilet/Manifest
index 71c508f8dbb3..389bdb6ce423 100644
--- a/app-misc/toilet/Manifest
+++ b/app-misc/toilet/Manifest
@@ -1,3 +1,3 @@
 DIST toilet-0.3.tar.gz 864880 BLAKE2B 824ed5ecf4ee7ae470290f5fa33fdf6489098481b92370138a75c3a50ef1a1f9e9d6572de06c257272b97c45ca27246e52d9342e77d794917553176c1b301dd0 SHA512 64b9389562a51e7dba6e3f1dd27c5340f90df25d8fbf1e041b539f5243b5b6b7af1ebf033a511053ad72a73908d496a1f3d14c4ac656425aefb8364a0664ceed
-EBUILD toilet-0.3.ebuild 661 BLAKE2B 8dbfc46c2607793eb83f2ac2ed5a62111f1c56a6857a3bd5bf3746bb891439a8aa08fd73b6c464954ea1b2af99a5d094646581473cc2d251b03970445418a558 SHA512 cbb0a9290afd871c54351f9a9a9d900fa840f3985abc1dfa0fa0f44762a2edebb1f0a53a1f3cdce4c4ad024c0e9e0e877351952bdfd69b36a78906e526c74884
+EBUILD toilet-0.3.ebuild 651 BLAKE2B a251ca68587da813123d3c41a03acdcdb7adc17be570bb935547a6cd642c4115e6e404b462849727429bdecb9dbd2360eabf365ef1e23cb6366fff1ec4dbab46 SHA512 d969f46ee6eea23af8ab5ff3013e0bfbb6b88136834b0dc78177cd012353b005289a7d4c9ce47934bed3b666a13cdf8f4f78c494cfbb148f4a3b772316314509
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-misc/toilet/toilet-0.3.ebuild b/app-misc/toilet/toilet-0.3.ebuild
index 614b0cac935e..b2bf618d9cb7 100644
--- a/app-misc/toilet/toilet-0.3.ebuild
+++ b/app-misc/toilet/toilet-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://caca.zoy.org/raw-attachment/wiki/${PN}/${P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libcaca-0.99_beta18"
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 3dc1ceb5a35d..0a7206d38432 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,7 +2,7 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
-EBUILD uptimed-0.4.1-r1.ebuild 1581 BLAKE2B 1e3d06682282172a0cfbc8e40a81ccdebfe559b7a1d31f58db8b46924491ffdab2c9a928eb7b3006d58689cacf0ca84b45c231f933b20842bec94bdbed4d2078 SHA512 6454399030808f349752f563dc9d35ad64eede2365b5a5933a2d1c1f0a100568cc54e5c627c481f118c77db19836d6e92309344d587aef635be5474e3611bb49
-EBUILD uptimed-0.4.1-r2.ebuild 1613 BLAKE2B fa6b0aacb33dffac4e1882b85bb8ec87207584e0ead37fc74985b4f00b94b01ca1f438465d9ec1df733ed753fddb08e18e01428445fff6c301915fffc3090a45 SHA512 7a646071b46404f301d4118f4e9148a0ee88d16ee427938620b11fe72ae6b5dd5600f9838dba5f8b9a01a4e02f203f99ece7b67f95023f63f2721fbf97c84f91
-EBUILD uptimed-0.4.2.ebuild 1613 BLAKE2B fa6b0aacb33dffac4e1882b85bb8ec87207584e0ead37fc74985b4f00b94b01ca1f438465d9ec1df733ed753fddb08e18e01428445fff6c301915fffc3090a45 SHA512 7a646071b46404f301d4118f4e9148a0ee88d16ee427938620b11fe72ae6b5dd5600f9838dba5f8b9a01a4e02f203f99ece7b67f95023f63f2721fbf97c84f91
+EBUILD uptimed-0.4.1-r1.ebuild 1571 BLAKE2B b0680217f7b8d0a2be15397f6983bfdf2b8c197f704e557de96d4c457f215990f25b64efd0a1a05e9e86297ab76de5c7a885c244f905e3a68648fad5eb3c7282 SHA512 f7abf1cf8d7204caeaca4749cb8c9afc8f8672ddf91f4d36521e5427eef663e9745e513532ae11bdca1daf73fe2e79555bd73902cfebe36bad999a3294664be1
+EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
+EBUILD uptimed-0.4.2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 90366a4a5786..6f480c82b6f4 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 pkg_setup() {
diff --git a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
index 1986bbd3429a..f0e96cbc3b14 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index 1986bbd3429a..f0e96cbc3b14 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 96625ad46a51..a049679042af 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,8 @@
 AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
+DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
 DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da650922b71fc1d6ef107ce51af9a4b1155fb699f800cca452e644345568af4cf17170dc15509393df529336b3959 SHA512 53f45824ffdbd987fecd3a7f7b6d6c5da036aeb3ddbb219d7665a63cae55d68db608239055b18b88a721b39002fcf57cbfd88aa366cffb02ca5f2eb94a206eb2
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
+EBUILD vifm-0.10.1.ebuild 2112 BLAKE2B 1f7c763cd3953780b6324a1b7daa4ba70395f9f9e44e7b2271f42c62227c6b8fbaf1db08ba096398609b2524773355af5c2c7404f0844b487a290caa6f41c8c9 SHA512 79bbbb31db8361dd7fff1d33f0bdd691547d5f64481bd5109e8485abb03cdb59891cf66629682448d03243adc28201b073d60ae1f116d507aeb4d5833a3f05fb
 EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
 MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/vifm-0.10.1.ebuild b/app-misc/vifm/vifm-0.10.1.ebuild
new file mode 100644
index 000000000000..721045586d7a
--- /dev/null
+++ b/app-misc/vifm/vifm-0.10.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vim-doc versionator xdg-utils
+
+MY_P=$(replace_version_separator 4 '-' ${PF})
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
+		|| die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ${DOCS}
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
index 66219c431fbf..1797baf1c9b5 100644
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@@ -1,6 +1,3 @@
-AUX vit-allow-nonsudo-install.patch 978 BLAKE2B 93603afb84034316c807508a8169ae4ffc22b46b311722fb730fe89c9f934d8a440432e0fb5dc8f2f056dab48d8074ef9ecb67b976a076f0eb670381128d2ffe SHA512 11b50594481934dd33a5f59bf04c61c7a347e517f1f0408be8c7463731490bf49c0c823c4b9ac1b951ac1f7e66d531f2d0df74ee12c3d25f47a299a2b16da628
-AUX vit-fix-man-installs.patch 739 BLAKE2B 6f3a212752a83735bca279ee3bea2dbdba2aafdb72cf6c79a2b65eb0feff6fd25718c91a30ca150e1ff929ab0e880433557ae18be84c7dab291be8ff879c6090 SHA512 9b1795690ba090bf0487b35da28f3563f5bae4a8133d85f469a9b0104a84588d8948b98a2935b83c9c321fcffcf5a44027500eb87a736de4b254374f142dc572
-DIST vit-1.2.tar.gz 49346 BLAKE2B e1dd7cae2db714e20c60dbff704575e185ae2d844f3be8934dbfe0ca8e754b64ad3bd800407ab31024b81cf06f32fde61914e008e1c5d2d4293ee4060785321f SHA512 dc0e09fbec7d77817b044f437e42108a9282e387698dfe23bfbe50a083b708d5d3b432ce9b1fdb93f3fef495af2a5f16107351557a4bb9184c7c762b264f0ed3
-EBUILD vit-1.2-r1.ebuild 822 BLAKE2B a0244c198407ca65e85527eaaaeb8843caf012030c68a30122fa78a4179cdd4c1d8ffaeb1ff2699f17f998948d979b24ed9f7e18500f9fd50b74525fb22f4ce3 SHA512 63fb6e2ebe073435260630f4be7b85e4afdb4d05e3546652487fb39ba9820af1a9c33b31b02d8a5432fad35b20a53c2bfd3bc09a387c370b1f14a9286899ff32
-EBUILD vit-9999.ebuild 777 BLAKE2B 92a1e9527219aa76b892b16c47bdab7be2f5f5d89972a636259094aec5e8075e88e1ba5b01e9fa5b7dd48d34990934c0471219d21e13984a4946eb980751189a SHA512 e8779d3179f4eea0344b238860c8019447d91d38fc4b0d2173a55c70e29027c3d0fef5cd246faaed173535531f465e5bd967d8bd78fcd83676f5174229926ae3
-MISC metadata.xml 457 BLAKE2B ecdaf5aed8c19a4c345d5a747ccf842026cdd7623e76be162c0429f03f289ab69d1cb7d3270e5adb6020bb079c8453e3459dabfd24e3a58d715810a515c625bd SHA512 fa9700903506961b1d8c62718b77a7219c811b99039d8f73d331dcd448f2df8fa638f152b956c9f41e2989007402860a1a036427d38d754a4385cebfa7a5b5c7
+DIST vit-1.3.tar.gz 56035 BLAKE2B 871e29767dd5aeb39e6876981246c7d42cdbe45320e3a2524bbc3c2aa055b65a04a54ee4a2bc122c3bf689fec93f117ec7b238dd5462a9133c35cf177cf454e7 SHA512 45ae4a1d08560d534a02a046d2fcf55c5401f9aaab0abcfbd13070fee28854268ba327018aea40317a184b9e28b074973f5d3e4169a479227e94b8401f066527
+EBUILD vit-1.3.ebuild 542 BLAKE2B 97207896147fe063c0db68cf95bcf14fbff6c5e99e69b467b0d5c3a8b2b8b9175696d0a825013818ed5a397a9150e820f4f1ccaf17f4c33b0a45a7102f04e3d5 SHA512 938f1702d874f62c48ebf4112fd70aba802345e5fd580db213e0481ac7ebc6d5884a668e67c69fd2ae68c0288ea94b3f75aff8d1f7e2ebd8a598a43fe3606a1d
+MISC metadata.xml 545 BLAKE2B e38ed1468698bb0a7125db2cdc313e015c04ca519e057edbd62e032eb2a43817b3ef6c065afe67d564be1f08a4dbc8f4b5d84da5a0bc35454793ae9af2787fa6 SHA512 85f31a91748127ce4af59ad39d072abc0b7e81fdbce1d56155ceb4bdc3b4bfeff5e4832072895192afd9fa2076dbf4604b6fa579650f079f5f43911efb982ce5
diff --git a/app-misc/vit/files/vit-allow-nonsudo-install.patch b/app-misc/vit/files/vit-allow-nonsudo-install.patch
deleted file mode 100644
index 0f5626cce379..000000000000
--- a/app-misc/vit/files/vit-allow-nonsudo-install.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 87abf5b..66d6acd 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,6 +7,8 @@ VERSION=@VERSION@
- TASK=@TASK@
- PERL=@PERL@
- CLEAR=@CLEAR@
-+SUDO=@SUDO@
-+SUDO=sudo
- 
- .PHONY : install
- 
-@@ -28,14 +30,14 @@ build:
- 	chmod 755 vit
- 
- install:
--	sudo mkdir -p @prefix@/bin
--	sudo cp vit @prefix@/bin/vit
--	sudo mkdir -p @prefix@/man/man1
--	sudo cp vit.1 @prefix@/man/man1/
--	sudo mkdir -p @prefix@/man/man5
--	sudo cp vitrc.5 @prefix@/man/man5/
--	sudo mkdir -p @prefix@/etc/
--	sudo cp commands @prefix@/etc/vit-commands
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
-+	$(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
-+	$(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
-+	$(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
-+	$(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
- 
- autoconf:
- 	@make -f .makefile autoconf
diff --git a/app-misc/vit/files/vit-fix-man-installs.patch b/app-misc/vit/files/vit-fix-man-installs.patch
deleted file mode 100644
index 9d13fbb287a0..000000000000
--- a/app-misc/vit/files/vit-fix-man-installs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 66d6acd..c167ae4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -32,10 +32,10 @@ build:
- install:
- 	$(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
- 	$(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
--	$(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
--	$(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
--	$(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
--	$(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man1
-+	$(SUDO) cp vit.1 $(DESTDIR)@prefix@/share/man/man1/
-+	$(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man5
-+	$(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/share/man/man5/
- 	$(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
- 	$(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
- 
diff --git a/app-misc/vit/metadata.xml b/app-misc/vit/metadata.xml
index 48a67656210f..e5b8618e3429 100644
--- a/app-misc/vit/metadata.xml
+++ b/app-misc/vit/metadata.xml
@@ -2,12 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>nerdboy@gentoo.org</email>
-	<name>Stephen Arnold</name>
+  <email>nerdboy@gentoo.org</email>
+  <name>Stephen Arnold</name>
 </maintainer>
 <longdescription lang="en">
-	A perl/Curses front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
-	provides a fullscreen terminal window with modes and commands
-	modeled after the vi editor.
+  A perl/Curses front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
+  provides a fullscreen terminal window with modes and commands
+  modeled after the vi editor.
 </longdescription>
+  <upstream>
+    <remote-id type="github">scottkosty/vit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/vit/vit-1.2-r1.ebuild b/app-misc/vit/vit-1.2-r1.ebuild
deleted file mode 100644
index 6ab360543842..000000000000
--- a/app-misc/vit/vit-1.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
-HOMEPAGE="http://tasktools.org/projects/vit.html"
-SRC_URI="https://git.tasktools.org/EX/vit/archive/v1.2.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	app-misc/task
-	dev-lang/perl
-	dev-perl/Curses"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" # missing the extra .makefile for extra targets (like test)
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
-		"${FILESDIR}"/${PN}-fix-man-installs.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" SUDO="" install
-	dodoc AUTHORS README CHANGES
-	doman vit.1 vitrc.5
-
-	rm -rf "${ED}"/usr/man
-}
diff --git a/app-misc/vit/vit-1.3.ebuild b/app-misc/vit/vit-1.3.ebuild
new file mode 100644
index 000000000000..d259efed3a62
--- /dev/null
+++ b/app-misc/vit/vit-1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
+HOMEPAGE="https://github.com/scottkosty/vit"
+SRC_URI="https://github.com/scottkosty/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	app-misc/task
+	dev-lang/perl
+	dev-perl/Curses"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # missing the extra .makefile for extra targets (like test)
diff --git a/app-misc/vit/vit-9999.ebuild b/app-misc/vit/vit-9999.ebuild
deleted file mode 100644
index 0cd795e26a94..000000000000
--- a/app-misc/vit/vit-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils git-r3
-
-DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
-HOMEPAGE="http://tasktools.org/projects/vit.html"
-
-EGIT_REPO_URI="https://git.tasktools.org/EX/vit.git"
-if [[ ${PV} = 9999* ]]; then
-	KEYWORDS=""
-else
-	EGIT_COMMIT=v${PV}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-misc/task
-	dev-lang/perl
-	dev-perl/Curses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
-		"${FILESDIR}"/${PN}-fix-man-installs.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" SUDO="" install
-	dodoc AUTHORS README CHANGES
-	doman vit.1 vitrc.5
-
-	rm -rf "${ED}"/usr/man
-}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index acfbed791079..ec691207e6a7 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,6 +1,8 @@
 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.99pl1.tar.gz 122996 BLAKE2B 2e40cca19cf9c9c3726e877bd05158acb34f732d266c0a7d9d6a15c6c665eb4efa38694ceee81d1006e5eeb2fb5be92be8dc40c3b9aff52eed962491eec1f06a SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc
+DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
 EBUILD ytree-1.99_p1-r1.ebuild 702 BLAKE2B dcb280f1f0e436a787273509f1141e34a1b6b425995231ebd021792bfd8b7fb71666d7f40996fef1e473adc3e6ea5a639d0d7726523518bb82e0df51eaa814c5 SHA512 2261faeafd3d3753f83f84907cf2e65ec4c02189dde87836b220de7f7300ca83792040221cbb558907512761c2bca10aabebfc0f6d0a1399f9fffd8bd16fa300
 EBUILD ytree-1.99_p1.ebuild 642 BLAKE2B b4dffbcb98eae5f27b36d51772c091c3faa26bf56a85a0564556425d8fa55a48cf026e7f694665d4cba7bfc5ceee378a43617f5b81175e1dd9e323ec4d18d5da SHA512 19c27f5f852bfa4dcdaf25163160a9af3710907a4ade674faad5698f3ac6484b6f2110078b9383ac79b9687898a7910ff10f347d0ad89ec46c86031cb8f62e4d
+EBUILD ytree-1.99_p2.ebuild 702 BLAKE2B 87148834aa34832bb1699d416096b84b1b05988c1678111e27efd9b0c1256bbf82af7117f8b0f1a6ac8a6aa0b102f6e45ce2620ffb0bdc3fd3889be56c2a6baf SHA512 0749786c82b411117c5a911370078d84842de62857d4fc1b1de99a2164613e3f654990a2b1c0ba24b97068c421f2544457f64965f19579f67349aa27bf87eb70
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/ytree-1.99_p2.ebuild b/app-misc/ytree/ytree-1.99_p2.ebuild
new file mode 100644
index 000000000000..c988a0685894
--- /dev/null
+++ b/app-misc/ytree/ytree-1.99_p2.ebuild
@@ -0,0 +1,42 @@
+# 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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /app-misc
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)