Merge branch 'edge' into next

6 files changed, 2 insertions, 136 deletions

diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index b05b1b034f1b..09c084429f10 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,11 +1,4 @@
-AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe12ebf96e49cf28018e51e6c4c31cab0b8e18af60ffbb814c747de2293b3c270dacb03d556bdfb6a2a1c3752f SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a
 AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
-DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
-DIST ytree-2.00.tar.gz 124654 BLAKE2B db55a463c3103a544ce882da9e5297a9bde3d6e5b618332cf863dec87e6d1842197c5f6ae282e05d4a0674a8c8d52807f9eb2c163e87c1adf0b8c484e1874d62 SHA512 4306ac6f46187dafd48103348fc30cafd8cec50a196a526249c15528604ad635b0bbf96897fedcb69360b43000d0447698523168589aa917a5884252fa183529
-DIST ytree-2.01.tar.gz 124683 BLAKE2B b6ee398b21f22ded23d4cba03ab50fa45113f57341029db1bbba2bafdf286f77191904e9d785b1009d57d79d58d82dafebd4bf75753f0724c855f3410e867299 SHA512 2a3ee821462f5aec21aeb613b336831b1f94a5595a3aefc718b4e7516471f43db85e8e430f2d9593d199f455719bacb7ee19e3419806a599354c29ff49d71ae6
 DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
-EBUILD ytree-1.99_p2.ebuild 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
-EBUILD ytree-2.00.ebuild 617 BLAKE2B 656e5b1c91754b3bd8ef7623f00396e5c084f5d48f2330536c95cc4fe8a1f53dfe7f7b9322d2d7aaab6e9d10d464509e3df229b1aef0d469ac43050de376e29e SHA512 f98140497eacb460b43ed9d9c0c55ebca2500552fd7203504cd703d47f1ac873891abb82fe03039210e06040bd165f6214bdeeed1be112ad95b9c161190ac2b4
-EBUILD ytree-2.01.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
-EBUILD ytree-2.02.ebuild 617 BLAKE2B 26f30f9decbb3ca0b93a438fda176ed684bcbe5c98852582467ec43e1e70a10d6f8f13f73ebdf314bb80b7affd24a20bcf01b1fff791cfc23a411cb0409bd55e SHA512 6d212d04cf94666e0d820cf611328610959ee59f4f05c1ac386ea8ef1f5b71079d853379817bed31d6f5e0a458fdd9019c0e5c62bfd05e50fca08ffee9fb2e1e
+EBUILD ytree-2.02.ebuild 615 BLAKE2B eba52702d30fd8e1c829771d8edf8d3c9e522d93d0e46378fc9ea5e4c8f010f03d2a789c349e95d941a6d0cdb8a61b56177fa00750027a6304872cacc30a9b33 SHA512 118e154f6fe99ee6c95ea84c704881faf497da262b62f3dc69a3476c3fc1095c548af5a3b25ec6bd9c75b044e017a76775f6a9e89c6fb36f87dea1ff566237de
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/files/ytree-1.94-bindir.patch b/app-misc/ytree/files/ytree-1.94-bindir.patch
deleted file mode 100644
index a79904e923b3..000000000000
--- a/app-misc/ytree/files/ytree-1.94-bindir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2010-04-11 17:44:57.511131862 +0200
-+++ ./Makefile	2010-04-11 17:44:14.143178887 +0200
-@@ -225,6 +225,8 @@
- 		$(CC) $(LFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- install:	$(MAIN)
-+		if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
-+		if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi
- 		install $(MAIN) $(BINDIR)
- 		gzip -9c ytree.1 > ytree.1.gz
- 		if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz  $(MANDIR)/; fi
diff --git a/app-misc/ytree/ytree-1.99_p2.ebuild b/app-misc/ytree/ytree-1.99_p2.ebuild
deleted file mode 100644
index d4e2e2e040c8..000000000000
--- a/app-misc/ytree/ytree-1.99_p2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-1.99pl2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="http://www.han.de/~werner/ytree.html"
-SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.94-bindir.patch"
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.00.ebuild b/app-misc/ytree/ytree-2.00.ebuild
deleted file mode 100644
index b914efb10d8a..000000000000
--- a/app-misc/ytree/ytree-2.00.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.01.ebuild b/app-misc/ytree/ytree-2.01.ebuild
deleted file mode 100644
index 3a14d3abcd18..000000000000
--- a/app-misc/ytree/ytree-2.01.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A curses-based file manager"
-HOMEPAGE="https://www.han.de/~werner/ytree.html"
-SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.99-tinfo.patch"
-)
-
-DOCS=( CHANGES README THANKS ytree.conf )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/app-misc/ytree/ytree-2.02.ebuild b/app-misc/ytree/ytree-2.02.ebuild
index 3a14d3abcd18..a3a24fd384af 100644
--- a/app-misc/ytree/ytree-2.02.ebuild
+++ b/app-misc/ytree/ytree-2.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="