gentoo resync : 25.11.2020

5 files changed, 7 insertions, 96 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index b2549fca9a3a..04e859b7c6e5 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,5 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
-AUX lesspipe.sh 8058 BLAKE2B d4ead282e5a57891970283e26b82cbf38979612857ce9dadda6a37ef82a879731ec64b30d02c3b99bba98d9791fa3ea6b7df965c7ad43c6de30d7a4835b11dc8 SHA512 6ac05bd89eaced691c47427eb1fa350a25dc3a7e716b41d08ec9d7a7fa9b8aabce9f5e3f073faddecb00a87dd46d8edc5f7856842b8c553fb50a450d6c9669cf
-DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
-DIST less-562.tar.gz 335444 BLAKE2B 4830673d17594aea7424ee88b82bc2e073275a77ed39c067c032a0b79b0d15f8c0d97f98381a57192e985054cd04b3a824ef6c3e6ef796885a9677681a4cb109 SHA512 c9a0f43da0fcdb515e5d4f56a666fa7c8b12d52fd5a1cd4f6cc5f79133376400b0ef24a206c0cf5fd3558fba9a8055f219038bad8c3dadf0504ea96c419c4573
+AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
-EBUILD less-551.ebuild 1392 BLAKE2B a81cb5c09b972404d6893a020f18c6f6ed592d28423d7ddb691dfdda3b7f241bb520a420e45e6557c374695cad57ab52c3193f9098c4a9a4b67e80911c3dbf35 SHA512 68e995a4a03c032ee2d1a183326050610e56f081cf7a7f2e71921caa149449f2f1eaafc3319dbd9ca71a0e22f589101c8bbcb9aa317c928c5457e3ae86514d46
-EBUILD less-562.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
-EBUILD less-563.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
+EBUILD less-563-r1.ebuild 1395 BLAKE2B 0a0cb41f1cfff3e75056fa08e693d487dea13f003ce6fd99d8bcb27846bcaebc38253347d726d712f4e5cf4504280513c55ccb165c22021d1b70a8c574565395 SHA512 f23da9f98d004f6285d8c0ebd09165d15b112a4b43223de3ffcef528429521097a7a32d1f58f1c3febd731bf71dd60ecfb6d17d887cdc8e024b5588c02871c47
 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe-r1.sh
index a393de07ec7b..9dcfea1d6399 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe-r1.sh
@@ -19,6 +19,7 @@ guesscompress() {
 		*.lzma)     echo "unlzma -c" ;;
 		*.lzo)      echo "lzop -dc" ;;
 		*.xz)       echo "xzdec" ;;
+		*.zst)      echo "zstdcat" ;;
 		*)          echo "cat" ;;
 	esac
 }
@@ -79,6 +80,7 @@ lesspipe() {
 	*.[0-9n].gz|*.man.gz|\
 	*.[0-9n].lzma|*.man.lzma|\
 	*.[0-9n].xz|*.man.xz|\
+	*.[0-9n].zst|*.man.zst|\
 	*.[0-9][a-z].gz|*.[0-9][a-z].gz)
 		local out=$(${DECOMPRESSOR} -- "$1" | file -)
 		case ${out} in
@@ -119,7 +121,7 @@ lesspipe() {
 
 	### Tar files ###
 	*.tar|\
-	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\
+	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\
 	*.tar.lz|*.tar.tlz|\
 	*.tar.lzma|*.tar.xz)
 		${DECOMPRESSOR} -- "$1" | tar tvvf -;;
@@ -129,6 +131,7 @@ lesspipe() {
 	### Misc archives ###
 	*.bz2|\
 	*.gz|*.z|\
+	*.zst|\
 	*.lz|\
 	*.lzma|*.xz)  ${DECOMPRESSOR} -- "$1" ;;
 	*.rpm)        rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
diff --git a/sys-apps/less/less-562.ebuild b/sys-apps/less/less-562.ebuild
deleted file mode 100644
index 375e2585ca5b..000000000000
--- a/sys-apps/less/less-562.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-563-r1.ebuild
index cfc0e10bf5e8..1bd6c54437a8 100644
--- a/sys-apps/less/less-551.ebuild
+++ b/sys-apps/less/less-563-r1.ebuild
@@ -30,7 +30,7 @@ src_configure() {
 src_install() {
 	default
 
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
 	newenvd "${FILESDIR}"/less.envd 70less
 }
 
diff --git a/sys-apps/less/less-563.ebuild b/sys-apps/less/less-563.ebuild
deleted file mode 100644
index 375e2585ca5b..000000000000
--- a/sys-apps/less/less-563.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}