gentoo christmass resync : 25.12.2020

4 files changed, 2 insertions, 88 deletions

diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index a0271ade2180..721e62116878 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,7 +1,4 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
-DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
-EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B e3560608b4163160461ad68b090f2c572f5cdc261064ce8316d9dcde7f26dcd54dad5ec9e49a7adb30cd76320e970c28c8cfc1da86a28fc544f34c0218f9e94f SHA512 0aa47789f61b067dc8191b3193dc402019df557693565bca63e6c3bc774d85c203ddf2a1ba430c7e23ed7164bf44a647261f9912df9b2596fa492f475d067067
-EBUILD tree-1.7.0.ebuild 1057 BLAKE2B c95e3fa8698e8630923688de312f104dbcee472ce6acd4b6c4f055e44d8c4942fbd43510b48d06e54db65ce550eb936bd2e61f3f3ae44e06df8716cb47acbb08 SHA512 7109d3b42d21f02b99bae7ad5cb5970907152a6b8a768a3a3016fed1f392d19b721c3b0ff3e54d8d877834543818ca1a139d21f4a34607b77c42c5f6e735f293
-EBUILD tree-1.8.0.ebuild 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
+EBUILD tree-1.8.0.ebuild 1040 BLAKE2B d2ac723a3dbd635d82e8325c692f9de7855917cd1b09710a2d3477566e901eebdf54576bf90f5cf2d6b3a83ea6dfdb9abadbae0f57045bcae5acdaed4591217b SHA512 af03f5cb029977e47490976044e71b9866b2192682f0176557e2df0983672c922ab4cd674bdbf6bf1ccc1364e2e859767ce9e7f41f68d5333ee070d85f60ca05
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
deleted file mode 100644
index b76daa598d94..000000000000
--- a/app-text/tree/tree-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's:LINUX:__linux__:' tree.c || die
-	mv doc/tree.1.fr doc/tree.fr.1
-	if use !elibc_glibc ; then
-		# 433972, also previously done only for elibc_uclibc
-		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
-	fi
-	default
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin tree
-	doman doc/tree*.1
-	einstalldocs
-	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
deleted file mode 100644
index e9a968908ce9..000000000000
--- a/app-text/tree/tree-1.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's:LINUX:__linux__:' tree.c || die
-	mv doc/tree.1.fr doc/tree.fr.1
-	if use !elibc_glibc ; then
-		# 433972, also previously done only for elibc_uclibc
-		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin tree
-	doman doc/tree*.1
-	dodoc CHANGES README*
-	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index b862f8493c38..42842fb57b01 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""