gentoo resync : 10.11.2019

37 files changed, 97 insertions, 673 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 04d4f6e681f7..c3f6201525ce 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 3639aba3bd3a..33e5f3739b7d 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -1,12 +1,11 @@
-AUX bb-1.3.0_rc1-disable-pulse.patch 803 BLAKE2B a93fa403f76b8edbc3425be071b3a9ee1b8c6c7926f54539fe31ea9348bcf14b145224b1b0e9dd7ec6306ec3ed6ec236c02a2177e08ecd367e6e43fcbe5ffa2e SHA512 97f5255b19ea80c68eaa53aa6c9db55ad5e38e9749db24ba035ab5894cd5f9675dc0bbe695ec78d3e41037d771f669b9cf792feb41c0acc615b53cdf9eefbc1f
-AUX bb-1.3.0_rc1-fix-protos.patch 369 BLAKE2B 97b101ccb06cc8442928e55ef8e7b4acffbb2995eae6671cfa10c6787818a49cc8e3d76ec6a4577b8b49dd807c1ff87446ac792f460242fe1102b2b3e1c81298 SHA512 0f078053b9fed2a20cdd02b606ab7172ac3210f975ee3965a7a8699acd9b8c9a12e1c8119cc916a408db8df5572ce5d1b6d78a1956f055261b74abc4ce9fb960
-AUX bb-1.3.0_rc1-m4-stuff.patch 16358 BLAKE2B 7bac36976a4f024b2cc09011dc10cef4b315299d21356858b85547e3c2d0627a12b7ad4eb56230d065afcb1b255923ea1b9204969b6dcb1db5413534b1ea5c04 SHA512 cfa47a1aa4c602b789c9b6d8fd9b163639971f270c66030a4219b65169ddc83ed5c917665195c6533afb45364ac1d8a45879d341421e9e9c5e8ea44edb57087d
-AUX bb-1.3.0_rc1-messager-overlap.patch 1623 BLAKE2B d62400fa49b2bf57ade223eb14960500391a155cdedbccee7096b7c2688e5f68681bcc5d378099061a534c45d20c43b9e799bcf38af54e4a21326203c42f8508 SHA512 745dd6e5ed1bd1760509183ea4884f575b035165f6c0b9be804dbb28378ed39c899562c75aa1db8e006bff23734181fd5604092adae31de71685b728f78a173b
-AUX bb-1.3.0_rc1-noattr.patch 509 BLAKE2B c13edb1874a0ac334c86f35c76ebc9175e6c965f54a02f62018e322c520da619cdc36f9d69e8dd8d05c71a13232ca38d8901652491d5a20576fa46edd9ceec48 SHA512 e7c4831d8286db8afa0710a11d150e254d6fc738f91d45be6aaeddfcbdf4c530c1cc21091f967d9ba8ef6a399321d6c3ccf194d686a1a77861c72eb60454726c
-AUX bb-1.3.0_rc1-printf-cleanup.patch 2885 BLAKE2B 8e98079763901a468e11344f3f0553d1d335ae5d41a045f75ffe9093bf4bc6b9bc5579bc414fb8013670024cbc5ff3c0bb8bdf74bc77868d79e8b3d63b6ed1bb SHA512 c7181ace0914f9aac7963c473019058fe4d7340337fc19d06ae252bb6bfb2c96b9883915a903f419fb706916796906497c77ad4180d9d861a2a255959b1507de
-AUX bb-1.3.0_rc1-protos.patch 297 BLAKE2B f024f5ddf8567b04fd794c4ac5b9b1cab10ac979d6262657eea8b54ad05d6e1134d4a87251cc2a5fcb9366934772c55755421ee12e87a89a27df9c8ffff35415 SHA512 5e59bb912f1a5187e6a23fc9a66ddbed6e48c12074fd4d74b19fb88bc94aa39b8df27d62cfe8f7856a9e434f2be15261522a4150cb0f92588b53c99e33b853de
-AUX bb-1.3.0_rc1-zbuff-fault.patch 1105 BLAKE2B a6d183c91eb9a9f4c6f0095a6d36fe94931b27daaaf56e04c8b177d2fd77f583e6a267a06894a64b59e05a7749e39ae8bd6898466277b779aa98b1da811e06f6 SHA512 10159f628d993058074d6c97001acad2bc4c71df4331cea2f0d6c1b8bd8c578e230d2cc2e4313457c75252108ab136a1ccc8a626a760fcd4e024b6a370ed1e59
+AUX bb-1.3.0_rc1-disable-pulse.patch 744 BLAKE2B 0ded7bea285b29ec81bd8b35ca409bf48bed3092098e160d57c41a57d99e9900afd397853ba5bb06f629dc7ded90e7a842fa6b575c9af6614f469683f6ba5ebc SHA512 d43eea0c7088fd3e172b5794eeeef092f97edd5e5e1556e5b936031ab9f81d79cf91c5394d82e16f4752864e0b5aa9d72418ab80239d34a1e256c843b6d54fc1
+AUX bb-1.3.0_rc1-fix-protos.patch 310 BLAKE2B be8d5cb30a20c082d0ed7ea8193a58faa48834b3efa2eb0c5ef453e765afc2f3443ab516db2e39e00f3d5eded7bbca909bea6aa7754c08728849fd9c0c75417d SHA512 60b4e05648c53669f901da762691859810ee1c8644b9d9fe6d49995547eef1b0564ce2151a1882630527af553112bbbfa2c81ecd865a832887903d09901597c7
+AUX bb-1.3.0_rc1-m4-stuff.patch 16192 BLAKE2B c5b3be2ba29b4cd03b83112134fd797d916c7256579309bbb58308bdced7b639b84d46c44d132cd5443b0f268e989693f88890b97cf0a75348d3ab12ea98e40c SHA512 3e1e0cbf14fa548e6d7bc50a51ac8e4e711b3baf1d3db60bd7bfcb5a70abed7476e609282bd08678e38d25221833c3437b54085cffbc87c5d8ef33952985cd3c
+AUX bb-1.3.0_rc1-messager-overlap.patch 1556 BLAKE2B 8b4aa3efdc8990025f93128dcc2b58a20077d78a12d1e8a65d69803401fcb2f6b6366132e42b4e1e8c9b3d817bf193a25c3b0e6b8477ebe4dfd322ccc230af0f SHA512 516657e3a937d1a05bfda9abb3ef784119fe6d365901fc852b2a2feeeb9884e4f7ebd8c72d2ca9f4ce995f67b9c312ed7a0e1245cc2a42f37bacaf5bc514b8c2
+AUX bb-1.3.0_rc1-noattr.patch 513 BLAKE2B 6c41a98aa03ebaf1014524f04715a8165a3e31a8089859ea4d79a109152ad942d9e1d2d3affcab56f20e01240b7404a981752407af7f606d41d0dbf18d6d7eda SHA512 2f35394e6d6a197797c11fee787c26bee5be71545079aa6d8b948363e01b0b1500ab2834e77fa10b05cc722ed1a025869e8fbf77d0ab6b4f274b6473c366f854
+AUX bb-1.3.0_rc1-printf-cleanup.patch 2826 BLAKE2B 26ccbf74ba95f2d695d56a788f340243a72c89baaf4f5adb45aeee80ac02cb18b5b19613a2c7a7a0a821d8580dbcdc3bb8f999d7c4fda20d28054c55405a1bc7 SHA512 24e7b32abf80a44bebf00b192d151aad682b26283187fdbce6d64541df8535e821ae878dc4dd0abd1fcae04bdfa32b203d64920cbda4102fe7597af50721e51c
+AUX bb-1.3.0_rc1-protos.patch 183 BLAKE2B 61112802cba379eda21b293270b2bf61e6be892f8cd36ce494f31284ff7a92ab5e6c828f5cd7365868128d40f2711aa099f3148989151875025ddbb7f24fb0b4 SHA512 bcccae0c1838ee89a62581c25a4896e468cd1fcd5dd4bf98bbe2395aa40d15a39ea8408bfad31517ff57385d8d0b2e65ced8c7a93fd17cc7f9039390805229c5
+AUX bb-1.3.0_rc1-zbuff-fault.patch 1048 BLAKE2B bf8729e1654bb44bfc32ff9bb857e5aef082d7e2ba40494304696f399fe43bc82540f1f323504a24afc003c408e6b73d8decabb1599dd5ffbfa186cc3a19e89d SHA512 bce66400732270b9b4957cbcfe83d97baa9ff011876517ce292949c1fe23945fb02768542c8b4b59b350403a0a3f8b1dae998800b64d84f34b8c37e5e3ba0cc2
 DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
-EBUILD bb-1.3.0_rc1-r3.ebuild 1799 BLAKE2B 920436513b8477421a225f68e2e685974f386bad559d7d8c95fef731434650c34e93788012526c61e3d570d58164e1938e0e94e3110485b454379754ec4cb9a6 SHA512 8ea1fe26660536ac59f49d8d7769eaf80e38e12bee8109915700f540c18f215ae779fe8f3825d0c1f19a0164fbcca9cea1170ca11a9ddbbc71fca642b0f264f0
-EBUILD bb-1.3.0_rc1-r4.ebuild 1959 BLAKE2B b011a6ff3f9ea885338d19d8690e875f7de7f74f58b27ed35fb4ce34df59e477f0973efcd46f8e9947aa1c0614eabaef6a18aeda16facb66385484c5487150b4 SHA512 ed6d7a39c2cd45482a0c723eb502b3a59f26a273d2388d3019705f55c03e9a7fc7f82a30a7f4389c09d5a0ca9f5973b3bdaebca97c532e31443620e3ab3dbde2
+EBUILD bb-1.3.0_rc1-r5.ebuild 1861 BLAKE2B ceea9b98bf6c306f7ab4aff6eb07fc08835e604d7840d9930899bb1a782a862365fd6d8a487aebcb2a1da25d6f9ccc56837c3b71df1c0cb1bc69bf0f61983fc3 SHA512 32c062f355e1e43ab5f9f4b0e7cd10aacc29523568f473270bf2aa53724dafc559a5b9aec8ba7c0e63539a2ee63807ad1d2dc536b87237ea5180258cf6459106
 MISC metadata.xml 331 BLAKE2B cc3fc6a0098a1ff90cc8805de2c65f68e003a2f707f88567962821295a7a0be3d9e970ea1271f931a46107b034e5dcbd46f254d816525d79f3bac8ee22855082 SHA512 12b5d682065c1178989edc16c08b82bd57833e161e647fa81dfee06a55c2147b5229093196b2157bc8ca421c9fd459ce015fb5dac2de1e35e1ad908d2120e0ed
diff --git a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild b/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
deleted file mode 100644
index 467732903e63..000000000000
--- a/app-misc/bb/bb-1.3.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils versionator
-
-MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
-
-DESCRIPTION="Demonstration program for visual effects of aalib"
-HOMEPAGE="http://aa-project.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mikmod"
-
-DEPEND="media-libs/aalib:=
-	dev-libs/lzo:=
-	mikmod? ( media-libs/libmikmod:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-noattr.patch"
-	epatch "${FILESDIR}/${P}-fix-protos.patch"
-	epatch "${FILESDIR}"/${P}-messager-overlap.patch
-	epatch "${FILESDIR}"/${P}-zbuff-fault.patch
-	epatch "${FILESDIR}"/${P}-printf-cleanup.patch
-	epatch "${FILESDIR}"/${P}-m4-stuff.patch
-
-	# unbundle lzo, #515286
-	rm -v README.LZO minilzo.{c,h} mylzo.h || die
-	sed -e 's/minilzo.c//' \
-	    -e 's/minilzo.h//' \
-	    -e 's/README.LZO//' \
-		-i Makefile.am || die
-	echo 'bb_LDADD = -llzo2' >> Makefile.am || die
-	# update code
-	sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
-	    -e 's,int size = image,lzo_uint size = image,' \
-		-i image.c || die
-
-	# rename binary and manpage bb -> bb-aalib
-
-	mv bb.1 bb-aalib.1 || die
-	sed -e 's/bb/bb-aalib/' \
-		-i bb-aalib.1
-	sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
-	    -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/'     \
-	    -e 's/bb_SOURCES/bb_aalib_SOURCES/'               \
-	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
-		-i Makefile.am || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
-}
diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
index 668b4f4df30b..793a64d7de56 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils versionator
+inherit autotools
 
-MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
+MY_P="${PN}-$(ver_cut 1-2)$(ver_cut 4-5)"
 
 DESCRIPTION="Demonstration program for visual effects of aalib"
 HOMEPAGE="http://aa-project.sourceforge.net/"
@@ -23,17 +23,21 @@ DEPEND="media-libs/aalib:=
 # media-libs/libmikmod[openal] is due to bug #516964
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noattr.patch
+	"${FILESDIR}"/${P}-fix-protos.patch
+	"${FILESDIR}"/${P}-messager-overlap.patch
+	"${FILESDIR}"/${P}-zbuff-fault.patch
+	"${FILESDIR}"/${P}-printf-cleanup.patch
+	"${FILESDIR}"/${P}-m4-stuff.patch
+	"${FILESDIR}"/${P}-protos.patch
+	"${FILESDIR}"/${P}-disable-pulse.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-noattr.patch
-	epatch "${FILESDIR}"/${P}-fix-protos.patch
-	epatch "${FILESDIR}"/${P}-messager-overlap.patch
-	epatch "${FILESDIR}"/${P}-zbuff-fault.patch
-	epatch "${FILESDIR}"/${P}-printf-cleanup.patch
-	epatch "${FILESDIR}"/${P}-m4-stuff.patch
-	epatch "${FILESDIR}"/${P}-protos.patch
-	epatch "${FILESDIR}"/${P}-disable-pulse.patch
+	default
 
 	# unbundle lzo, #515286
 	rm -v README.LZO minilzo.{c,h} mylzo.h || die
@@ -58,7 +62,8 @@ src_prepare() {
 	    -e 's/bb_LDADD/bb_aalib_LDADD/'                   \
 		-i Makefile.am || die
 
-	AT_M4DIR="m4" eautoreconf
+	mv -v configure.{in,ac} || die
+	eautoreconf
 }
 
 pkg_postinst() {
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
index dcc00c642335..3d7889101b93 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -1,6 +1,4 @@
 https://bugs.gentoo.org/516964
-diff --git a/main.c b/main.c
-index c0648b4..a9fac57 100644
 --- a/main.c
 +++ b/main.c
 @@ -160,6 +160,17 @@ main (int argc, char *argv[])
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
index 577f306c8169..a85166b01309 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
@@ -1,8 +1,6 @@
 Fixes warning:
 main.c: In function 'load_song':
 main.c:56:23: warning: incompatible implicit declaration of built-in function 'strlen'
-diff --git a/main.c b/main.c
-index ae852a7..417ff62 100644
 --- a/main.c
 +++ b/main.c
 @@ -21,6 +21,7 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
index 0fa98f8162f5..843d839908f7 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
@@ -6,9 +6,6 @@ Date:   Tue Feb 7 10:59:09 2012 +0300
 
     bb-1.3.0_rc1: bundle m4 source
 
-diff --git m4/aalib.m4 m4/aalib.m4
-new file mode 100644
-index 0000000..991fbda
 --- /dev/null
 +++ m4/aalib.m4
 @@ -0,0 +1,169 @@
@@ -181,9 +178,6 @@ index 0000000..991fbda
 +  AC_SUBST(AALIB_LIBS)
 +  rm -f conf.aalibtest
 +])
-diff --git m4/libmikmod.m4 m4/libmikmod.m4
-new file mode 100644
-index 0000000..18feebe
 --- /dev/null
 +++ m4/libmikmod.m4
 @@ -0,0 +1,207 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
index e46b75fd5815..378e6b7798b6 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
@@ -8,8 +8,6 @@ messager.c: fix memory overlap (fixes artefacts in scrolling text)
 ==363==    by 0x403009: bb (bb.c:258)
 ==363==    by 0x407C06: main (main.c:202)
 
-diff --git a/messager.c b/messager.c
-index 95cc410..964080b 100644
 --- a/messager.c
 +++ b/messager.c
 @@ -40,8 +40,8 @@ static void newline()
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
index 7a6f9474a71e..a4768ab75e28 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-noattr.patch
@@ -1,7 +1,7 @@
 # remove __attribute__
 
---- timers.h	Thu Apr 26 18:04:22 2001
-+++ timers.h	Sun Dec  9 18:44:31 2007
+--- a/timers.h	Thu Apr 26 18:04:22 2001
++++ b/timers.h	Sun Dec  9 18:44:31 2007
 @@ -49,8 +49,8 @@
  extern tl_group *syncgroup, *asyncgroup;
  void tl_sleep (int);
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
index da113795124b..b11b2333d1d6 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
@@ -8,8 +8,6 @@ zoom.c:260:113: warning: format '%i' expects type 'int', but argument 3 has type
 zoom.c: In function 'moveoldpoints':
 zoom.c:590:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
 zoom.c:596:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-diff --git a/zoom.c b/zoom.c
-index 7450095..b86cc8b 100644
 --- a/zoom.c
 +++ b/zoom.c
 @@ -241,13 +241,13 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
index aa3fc021e5c1..40f77a0f20cd 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -1,13 +1,9 @@
-diff --git a/bb.c b/bb.c
-index 95850ef..a394d00 100644
 --- a/bb.c
 +++ b/bb.c
 @@ -27,2 +27,3 @@
  #include <aalib.h>
 +#include <time.h>
  #include "bb.h"
-diff --git a/main.c b/main.c
-index 417ff62..c0648b4 100644
 --- a/main.c
 +++ b/main.c
 @@ -23,2 +23,3 @@
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
index b3e882ed55e9..7b6eda327d18 100644
--- a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
+++ b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
@@ -20,8 +20,6 @@ Valgrind says:
 ==4525==    by 0x4031BC: bb (bb.c:325)
 ==4525==    by 0x407C56: main (main.c:202)
 
-diff --git a/tex.c b/tex.c
-index 9f2f99d..b390510 100644
 --- a/tex.c
 +++ b/tex.c
 @@ -92,7 +92,7 @@ void unset_zbuff()
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index aaf03fbb0da6..713382e173b9 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.14.ebuild 1842 BLAKE2B 5d0373e6306b746f853020cf706615621ab88bd825d7e1362c34e30246dc8c73ba6cffc5acef8e7f8c3ffc81290795a37b5acfb54389cf5d66211d0c56e87245 SHA512 dc9dd1acc9622c8492ff3a17b14173cce3a4a325aac4602bc3456528e02f46145658bf40e6d02a2a25ba87e8d5af4cb570d99fec950eca12ac4fa8368b64418a
+EBUILD hivex-1.3.14.ebuild 1863 BLAKE2B 35510e76779b4f922488bda280313a1d833c0194f1bb72faf6727d81e22156d525b3d545f9c9b6276d81fa6cb6cb82c7b633bb94f05df7c047a4901624cccd98 SHA512 685d24f06b3ab3c0e64550726f416a2d34355273e1c8a607524dfcf17db959abce3412b7ea94a3aed565a636a3d535dabfdc4061c63e76874a76a6b3ccf83f4b
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index 07099a99b45c..b7386f5f5381 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -27,7 +27,10 @@ RDEPEND="
 			 dev-ml/findlib[ocamlopt]
 			 )
 	readline? ( sys-libs/readline:0 )
-	perl? ( dev-perl/IO-stringy )
+	perl? (
+		dev-lang/perl:=
+		dev-perl/IO-stringy
+	)
 	ruby? ( $(ruby_implementations_depend) )
 	python? ( ${PYTHON_DEPS} )
 	"
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 7b8e831af9bd..6cd2fd3f5952 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -8,5 +8,5 @@ AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
-EBUILD lcdproc-0.5.9.ebuild 6435 BLAKE2B b158f60e808abfe2f157dda515cd1a2d689936c524282a7d54e949e97d8cf158cbfc0b5db646036f7ed0da6738b2c23bb81f6ac4c0ce4ebe9f1f3020d340c0fd SHA512 b7287a7aaefc61f70dce9c54a90ef59d7272b6e5a3172cbb73ba6bfbc05f27b70f790bdc1ef6a03ade1b413f1aedeea811a1d79d9d4167c7a5cc9309a7af8c9c
+EBUILD lcdproc-0.5.9.ebuild 6442 BLAKE2B 929b3a0daf47fd9e1d424d07b411ca2320175c9fff062a6598ab78f26e725108e90cb0bac377fef08abc41cdded81cd318085f707858a2fcc47048396648d847 SHA512 8966dff12755ed82e9584ef47cbe988b97780361133f4817a5b33371fc6a83d624ac92d28bcd1c9d30daa0581196e3592bd967d5e06fc613ac0ec3fa90ded587
 MISC metadata.xml 1657 BLAKE2B 451feff202b2689815732765bb51e50c4e034702b674dd43f37294be9cdfa18f674af05aa067ae12956b41a15bde33c9fd3577fc181cde39b2ca4ae6eb578011 SHA512 fe207c4c26c9eb6140d165b9ddd0826bbdc1ff38f60f1cf97ede90ed601d52c94c4f302b429ab40709cb097e756e09387b7dba8c81eb052b2f8890c6a0006bed
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
index 7397f1bcdea2..e2d94ce2cdfa 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.lcdproc.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
 	https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0de4dbaef40f..137971df238c 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,8 +4,7 @@ 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 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
+EBUILD mc-4.8.22.ebuild 2860 BLAKE2B 89f2efd1f31ff3b4c50ff7d4e7c21db6605845cf668fa129e8e9a555d3cf1cbe24dce05b50b13141f310a4d16df5f51211acf8940fc46e31591fbade21eeda05 SHA512 3b458fc317e1a3e26e073ea3effb02c7b525cc9ba1ce19211453bb4b10b48ba94b4aefd0faafba42bb941b24f9e5b6ffefe155e1b8c857f2706ea2745978bd41
+EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
+EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
 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 a246a79ffb5a..256d07fc143e 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/${MY_P}
 
 pkg_pretend() {
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 9f58fc202682..7791376a19da 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
diff --git a/app-misc/mc/mc-4.8.23.ebuild b/app-misc/mc/mc-4.8.23.ebuild
deleted file mode 100644
index 32597904a63f..000000000000
--- a/app-misc/mc/mc-4.8.23.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-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-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 )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 14377f18812e..336a555d2aba 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	"
 
+RESTRICT="!test? ( test )"
+
 pkg_pretend() {
 	if use slang && use unicode ; then
 		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
diff --git a/app-misc/ps3pf_utils/Manifest b/app-misc/ps3pf_utils/Manifest
index c41d17a2753e..4352975cbf2c 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 582 BLAKE2B c4c9b05c8a5f67aca7e6bc9ea973ebdfa99b300a905d42825d0636912ea6c1834deaecb955c53e2ab0e1dc16085581eb6cc5383837de7ddb047db97fed4eadd3 SHA512 743fe158f7283530156be5547f10ce95692af44f3b6b5164e67739346a5b76cd0d85ea6f73e393a39e04a158b4b8aa62707ab91774de1524b31daf1ab7393788
+EBUILD ps3pf_utils-2.3.ebuild 501 BLAKE2B 700290bb6fa7b535176827a0f4721f4af5d275cd1da6a71698f7b1a57c3e18b6843a24efd5efc54a66d34e8a5bb4473f2a662924df27d64634fd22d02f606103 SHA512 da6d8cfb1fecb64765f41e3e0d81b54c63930175a08edd4abfd499fd1de3bcfbc6554bb3d90af32f1186200bd74e60b1aa1c43e69fa93053ca2da8293960de70
 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 3c10f438ef07..d605849936c5 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit flag-o-matic
+EAPI=7
 
 DESCRIPTION="Utilities to set the ps3 specific features"
 HOMEPAGE="http://www.playstation.com/ps3-openplatform/index.html"
@@ -17,7 +15,3 @@ IUSE=""
 # fixme: depend on a version of sys-kernel/linux-headers that supports ps3
 
 S=${WORKDIR}/ps3-utils-${PV}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 5493f599644f..6a396c43e90d 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,13 +1,6 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
-DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
-DIST tmux-2.8.tar.gz 491195 BLAKE2B 1dde20282f84a32647ebb26cdd2346f8870670f904cb06c293218f9db389ded316449f7870805d6d9c1cbb417890ace5e3c36c533bf64818b219f3265b9d2dfd SHA512 e382aec122a10624953432b3c869b21d69390bc2e7d459440a46950802e39503eafb398178f8085191261925e4f0872bb99b19e0403e7beb56d3ceecc4c86b09
-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 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 2304 BLAKE2B cb0fa73a6037ed21d08ea7eaf769077249b898ecd325a687337c03c2a9ca4c0f45c2b0317825b192ca63bc33db6eb18d36cd04f4bf9af6d20f4a43621adf9e02 SHA512 9fcbe33fe2704764ff494f1cb8b4a34af83402f0a544212d5a12d89d4aeefa9d14119550dc12f876b71d313a124e3b77472f4c70c0d6216a09562721b2a5f521
+EBUILD tmux-2.9a.ebuild 2303 BLAKE2B b29d374fcf5d6b9bb33b1276c5cc8edb953ff99d8cca04ccc02b0ea7a4381aa05114f58596d72e76cd8d2e2c3084d1b9b2fb988f58299d79cb0cb8eaa9ac6ab4 SHA512 53d231733d91b9f8cea295715e29b70c778bc66ffe6b2ba3b25b906535002f41f934e95731b8ae254c105b5d68addc359eb0a99d4729f002512f462fd999880c
 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
deleted file mode 100644
index ef0907a1e1e1..000000000000
--- a/app-misc/tmux/tmux-2.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-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="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README TODO )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
deleted file mode 100644
index 39e1657cbf22..000000000000
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-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="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-DOCS=( CHANGES README TODO )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.8-r2.ebuild b/app-misc/tmux/tmux-2.8-r2.ebuild
deleted file mode 100644
index 97bfd21a51c8..000000000000
--- a/app-misc/tmux/tmux-2.8-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-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="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README TODO )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-flags.patch
-
-	# upstream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.9.ebuild b/app-misc/tmux/tmux-2.9.ebuild
deleted file mode 100644
index 636f5f18de21..000000000000
--- a/app-misc/tmux/tmux-2.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="https://tmux.github.io/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
-	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
-else
-	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-DEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( app-vim/vim-tmux )"
-
-DOCS=( CHANGES README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-
-	# upstream fixes (can be removed with next version bump)
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-pkg_postinst() {
-	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index 2f279e119314..4aca6cd831b2 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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/yq/Manifest b/app-misc/yq/Manifest
index 789391ca7784..a0b0a370c900 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,7 +1,9 @@
 DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
 DIST yq-2.8.0.tar.gz 14434 BLAKE2B 1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69 SHA512 aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09
-EBUILD yq-2.7.1-r1.ebuild 1013 BLAKE2B f39627b1837f831abef226a3aab6af871152cc91127cbdb655b77007c9a961b396f94bf0a0a2069a1d279cdf82c64ea5e6192f406c589457c2481be80a6288de SHA512 7f50f7e0a789c4f9535446017c0e204ec1640ea3635d7b79194702b24e6f53082bc4822fd2194883384b0d02a0990d3da3c6331d3ff980dd3d4b91a4195fcff3
-EBUILD yq-2.7.2.ebuild 1015 BLAKE2B b43d4715abfd258f23250c3e4a7a2abac1b9ae18df4a30b192fced01937493cba60c6603d612ec0036b1c298850783b9f09d244d602a3a6aa3eff2507236ade4 SHA512 a13faa51953d299c5bf44a3723d61947f40724a37327d797d2aeff1ab129ac5e3ffb6c1dbdd4fd3ba4fea366c425827dfa0a2829cff5d5b73c1fe369c0ab7d6d
-EBUILD yq-2.8.0.ebuild 1015 BLAKE2B b43d4715abfd258f23250c3e4a7a2abac1b9ae18df4a30b192fced01937493cba60c6603d612ec0036b1c298850783b9f09d244d602a3a6aa3eff2507236ade4 SHA512 a13faa51953d299c5bf44a3723d61947f40724a37327d797d2aeff1ab129ac5e3ffb6c1dbdd4fd3ba4fea366c425827dfa0a2829cff5d5b73c1fe369c0ab7d6d
+DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
+EBUILD yq-2.7.1-r1.ebuild 1040 BLAKE2B 80231ec21baf9658fe95f86480247de9e52d593f0feff7293527579660c2e4058c273705c7f208536d53eb1ad1233caafc48ccad6a16dc8c9631b0567fc7003b SHA512 dd87aefcabf4e64e8422031c12faa8d32777f54f96354cff6f637d14636809884109797c04ed2753a9ecfacbe77509a8dcc1abef5b53ee582f02b7f0cbb425cc
+EBUILD yq-2.7.2.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
+EBUILD yq-2.8.0.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
+EBUILD yq-2.9.2.ebuild 1042 BLAKE2B 05dec9e4403dca31150a0139557e51d724219f79e7bc5f70ec3063aebc58ec3476bb10cc43ce9f4ea605f626d2b96ee4749b7c6cf924ee36f9f9ff40a38df761 SHA512 36862a0d905d67f5fd3efe001e993d27d95cf5ee630a549049318f36aec3e32e2f4e60c7d4ecc0800bb08a05d77ff9c23e19188a427384236cdf7d5b0c5c7428
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
index e433a14e78e8..45578ed432d8 100644
--- a/app-misc/yq/yq-2.7.1-r1.ebuild
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.7.2.ebuild
index 7dc084a4b39b..3c4174e21d49 100644
--- a/app-misc/yq/yq-2.7.2.ebuild
+++ b/app-misc/yq/yq-2.7.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
index 7dc084a4b39b..3c4174e21d49 100644
--- a/app-misc/yq/yq-2.8.0.ebuild
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild
new file mode 100644
index 000000000000..3c4174e21d49
--- /dev/null
+++ b/app-misc/yq/yq-2.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+}
+
+python_test() {
+	./test/test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index cd3ea91607e7..a366bf654a22 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,8 +1,5 @@
 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 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/ytree-1.99_p1-r1.ebuild b/app-misc/ytree/ytree-1.99_p1-r1.ebuild
deleted file mode 100644
index 2f5d5986175b..000000000000
--- a/app-misc/ytree/ytree-1.99_p1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-1.99pl1"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="http://www.han.de/~werner/ytree.html"
-SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.94-bindir.patch"
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-1.99_p1.ebuild b/app-misc/ytree/ytree-1.99_p1.ebuild
deleted file mode 100644
index 2d4f7c48fb4c..000000000000
--- a/app-misc/ytree/ytree-1.99_p1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-1.99pl1"
-
-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"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.94-bindir.patch" )
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}usr" install
-	einstalldocs
-}