From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 sys-apps/less/Manifest             |   8 +-
 sys-apps/less/files/lesspipe-r1.sh | 287 +++++++++++++++++++++++++++++++++++++
 sys-apps/less/files/lesspipe.sh    | 284 ------------------------------------
 sys-apps/less/less-551.ebuild      |  44 ------
 sys-apps/less/less-562.ebuild      |  44 ------
 sys-apps/less/less-563-r1.ebuild   |  44 ++++++
 sys-apps/less/less-563.ebuild      |  44 ------
 7 files changed, 333 insertions(+), 422 deletions(-)
 create mode 100644 sys-apps/less/files/lesspipe-r1.sh
 delete mode 100644 sys-apps/less/files/lesspipe.sh
 delete mode 100644 sys-apps/less/less-551.ebuild
 delete mode 100644 sys-apps/less/less-562.ebuild
 create mode 100644 sys-apps/less/less-563-r1.ebuild
 delete mode 100644 sys-apps/less/less-563.ebuild

(limited to 'sys-apps/less')

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-r1.sh b/sys-apps/less/files/lesspipe-r1.sh
new file mode 100644
index 000000000000..9dcfea1d6399
--- /dev/null
+++ b/sys-apps/less/files/lesspipe-r1.sh
@@ -0,0 +1,287 @@
+#!/bin/bash
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Preprocessor for 'less'. Used when this environment variable is set:
+# LESSOPEN="|lesspipe %s"
+
+# TODO: handle compressed files better
+
+[[ -n ${LESSDEBUG+set} ]] && set -x
+
+trap 'exit 0' PIPE
+
+guesscompress() {
+	case "$1" in
+		*.gz|*.z)   echo "gunzip -c" ;;
+		*.bz2|*.bz) echo "bunzip2 -c" ;;
+		*.lz)       echo "lzip -dc" ;;
+		*.lzma)     echo "unlzma -c" ;;
+		*.lzo)      echo "lzop -dc" ;;
+		*.xz)       echo "xzdec" ;;
+		*.zst)      echo "zstdcat" ;;
+		*)          echo "cat" ;;
+	esac
+}
+
+lesspipe_file() {
+	local out=$(file -L -- "$1")
+	local suffix
+	case ${out} in
+		*" 7-zip archive"*) suffix="7z";;
+		*" ar archive"*)    suffix="a";;
+		*" CAB-Installer"*) suffix="cab";;
+		*" cpio archive"*)  suffix="cpio";;
+		*" ELF "*)          suffix="elf";;
+		*" LHa"*archive*)   suffix="lha";;
+		*" troff "*)        suffix="man";;
+		*" script text"*)   suffix="sh";;
+		*" shared object"*) suffix="so";;
+		*" tar archive"*)   suffix="tar";;
+		*" Zip archive"*)   suffix="zip";;
+		*": data")          hexdump -C -- "$1"; return 0;;
+		*)                  return 1;;
+	esac
+	lesspipe "$1" ".${suffix}"
+	return 0
+}
+
+lesspipe() {
+	local match=$2
+	[[ -z ${match} ]] && match=$1
+
+	local DECOMPRESSOR=$(guesscompress "${match}")
+
+	# User filters
+	if [[ -x ~/.lessfilter ]] ; then
+		~/.lessfilter "$1" && exit 0
+	fi
+
+	local ignore
+	for ignore in ${LESSIGNORE} ; do
+		[[ ${match} == *.${ignore} ]] && exit 0
+	done
+
+	# Handle non-regular file types.
+	if [[ -d $1 ]] ; then
+		ls -alF -- "$1"
+		return
+	elif [[ ! -f $1 ]] ; then
+		# Only return if the stat passes.  This is needed to handle pseudo
+		# arguments like URIs.
+		stat -- "$1" && return
+	fi
+
+	case "${match}" in
+
+	### Doc files ###
+	*.[0-9n]|*.man|\
+	*.[0-9n].bz2|*.man.bz2|\
+	*.[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
+			*troff*)
+				# Need to make sure we pass path to man or it will try
+				# to locate "$1" in the man search paths
+				if [[ $1 == /* ]] ; then
+					man -- "$1"
+				else
+					man -- "./$1"
+				fi
+				;;
+			*text*)
+				${DECOMPRESSOR} -- "$1"
+				;;
+			*)
+				# We could have matched a library (libc.so.6), so let
+				# `file` figure out what the hell this thing is
+				lesspipe_file "$1"
+				;;
+		esac
+		;;
+	*.dvi)      dvi2tty "$1" ;;
+	*.ps)       ps2ascii "$1" || pstotext "$1" ;;
+	*.pdf)      pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
+	*.doc)      antiword "$1" || catdoc "$1" ;;
+	*.rtf)      unrtf --nopict --text "$1" ;;
+	*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
+	*.json)     python -mjson.tool "$1" ;;
+
+	### URLs ###
+	ftp://*|http://*|https://|*.htm|*.html)
+		for b in elinks links2 links lynx ; do
+			${b} -dump "$1" && exit 0
+		done
+		html2text -style pretty "$1"
+		;;
+
+	### Tar files ###
+	*.tar|\
+	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\
+	*.tar.lz|*.tar.tlz|\
+	*.tar.lzma|*.tar.xz)
+		${DECOMPRESSOR} -- "$1" | tar tvvf -;;
+	*.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
+		lesspipe "$1" "$1.tar.${1##*.t}" ;;
+
+	### Misc archives ###
+	*.bz2|\
+	*.gz|*.z|\
+	*.zst|\
+	*.lz|\
+	*.lzma|*.xz)  ${DECOMPRESSOR} -- "$1" ;;
+	*.rpm)        rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
+	*.cpi|*.cpio) cpio -itv < "$1" ;;
+	*.ace)        unace l "$1" ;;
+	*.arc)        arc v "$1" ;;
+	*.arj)        arj l -- "$1" || unarj l "$1" ;;
+	*.cab)        cabextract -l -- "$1" ;;
+	*.lha|*.lzh)  lha v "$1" ;;
+	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
+	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
+	*.a)          ar tv "$1" ;;
+	*.elf)        readelf -a -W -- "$1" ;;
+	*.so)         readelf -h -d -s -W -- "$1" ;;
+	*.mo|*.gmo)   msgunfmt -- "$1" ;;
+
+	*.rar|.r[0-9][0-9])  unrar l -- "$1" ;;
+
+	*.jar|*.war|*.ear|*.xpi|*.zip)
+		unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1"
+		;;
+
+	*.deb|*.udeb)
+		if type -P dpkg > /dev/null ; then
+			dpkg --info "$1"
+			dpkg --contents "$1"
+		else
+			ar tv "$1"
+			ar p "$1" data.tar.gz | tar tzvvf -
+		fi
+		;;
+
+	### Filesystems ###
+	*.squashfs)   unsquashfs -s "$1" && unsquashfs -ll "$1" ;;
+
+	### Media ###
+	*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
+		identify -verbose -- "$1" || file -L -- "$1"
+		;;
+	*.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
+		midentify "$1" || file -L -- "$1"
+		;;
+	*.mp3)        mp3info "$1" || id3info "$1" ;;
+	*.ogg)        ogginfo "$1" ;;
+	*.flac)       metaflac --list "$1" ;;
+	*.torrent)    torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;;
+	*.bin|*.cue|*.raw)
+		# not all .bin/.raw files are cd images #285507
+		# fall back to lesspipe_file if .cue doesn't exist, or if
+		# cd-info failed to parse things sanely
+		[[ -e ${1%.*}.cue ]] \
+			&& cd-info --no-header --no-device-info "$1" \
+			|| lesspipe_file "$1"
+		;;
+	*.iso)
+		iso_info=$(isoinfo -d -i "$1")
+		echo "${iso_info}"
+		# Joliet output overrides Rock Ridge, so prefer the better Rock
+		case ${iso_info} in
+			*$'\n'"Rock Ridge"*) iso_opts="-R";;
+			*$'\n'"Joliet"*)     iso_opts="-J";;
+			*)                   iso_opts="";;
+		esac
+		isoinfo -l ${iso_opts} -i "$1"
+		;;
+
+	### Encryption stuff ###
+	*.crl) openssl crl -hash -text -noout -in "$1" ;;
+	*.csr) openssl req -text -noout -in "$1" ;;
+	*.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;;
+
+# May not be such a good idea :)
+#	### Device nodes ###
+#	/dev/[hs]d[a-z]*)
+#		fdisk -l "${1:0:8}"
+#		[[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
+#		;;
+
+	### Everything else ###
+	*)
+		case $(( recur++ )) in
+			# Maybe we didn't match due to case issues ...
+			0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
+
+			# Maybe we didn't match because the file is named weird ...
+			1) lesspipe_file "$1" ;;
+		esac
+
+		# So no matches from above ... finally fall back to an external
+		# coloring package.  No matching here so we don't have to worry
+		# about keeping in sync with random packages.  Any coloring tool
+		# you use should not output errors about unsupported files to
+		# stdout.  If it does, it's your problem.
+
+		# Allow people to flip color off if they dont want it
+		case ${LESSCOLOR} in
+			always)                   LESSCOLOR=2;;
+			[yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;;
+			[nN][oO]|[nN]|0|false)    LESSCOLOR=0;;
+			*)                        LESSCOLOR=0;; # default to no color #188835
+		esac
+		if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then
+			# 2: Only colorize if user forces it ...
+			# 1: ... or we know less will handle raw codes -- this will
+			#    not detect -seiRM, so set LESSCOLORIZER yourself
+			if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
+				LESSQUIET=true ${LESSCOLORIZER} "$1"
+			fi
+		fi
+
+		# Nothing left to do but let less deal
+		exit 0
+		;;
+	esac
+}
+
+if [[ $# -eq 0 ]] ; then
+	echo "Usage: lesspipe <file>"
+elif [[ $1 == "-V" || $1 == "--version" ]] ; then
+	cat <<-EOF
+		lesspipe (git)
+		Copyright 1999-2019 Gentoo Authors
+		Mike Frysinger <vapier@gentoo.org>
+		     (with plenty of ideas stolen from other projects/distros)
+
+	EOF
+	less -V
+elif [[ $1 == "-h" || $1 == "--help" ]] ; then
+	cat <<-EOF
+		lesspipe: preprocess files before sending them to less
+
+		Usage: lesspipe <file>
+
+		lesspipe specific settings:
+		  LESSCOLOR env     - toggle colorizing of output (no/yes/always; default: no)
+		  LESSCOLORIZER env - program used to colorize output (default: code2color)
+		  LESSIGNORE        - list of extensions to ignore (don't do anything fancy)
+
+		You can create per-user filters as well by creating the executable file:
+		  ~/.lessfilter
+		One argument is passed to it: the file to display.  The script should exit 0
+		to indicate it handled the file, or non-zero to tell lesspipe to handle it.
+
+		To use lesspipe, simply add to your environment:
+		  export LESSOPEN="|lesspipe %s"
+
+		Run 'less --help' or 'man less' for more info.
+	EOF
+else
+	recur=0
+	[[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null
+	lesspipe "$1"
+fi
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
deleted file mode 100644
index a393de07ec7b..000000000000
--- a/sys-apps/less/files/lesspipe.sh
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Preprocessor for 'less'. Used when this environment variable is set:
-# LESSOPEN="|lesspipe %s"
-
-# TODO: handle compressed files better
-
-[[ -n ${LESSDEBUG+set} ]] && set -x
-
-trap 'exit 0' PIPE
-
-guesscompress() {
-	case "$1" in
-		*.gz|*.z)   echo "gunzip -c" ;;
-		*.bz2|*.bz) echo "bunzip2 -c" ;;
-		*.lz)       echo "lzip -dc" ;;
-		*.lzma)     echo "unlzma -c" ;;
-		*.lzo)      echo "lzop -dc" ;;
-		*.xz)       echo "xzdec" ;;
-		*)          echo "cat" ;;
-	esac
-}
-
-lesspipe_file() {
-	local out=$(file -L -- "$1")
-	local suffix
-	case ${out} in
-		*" 7-zip archive"*) suffix="7z";;
-		*" ar archive"*)    suffix="a";;
-		*" CAB-Installer"*) suffix="cab";;
-		*" cpio archive"*)  suffix="cpio";;
-		*" ELF "*)          suffix="elf";;
-		*" LHa"*archive*)   suffix="lha";;
-		*" troff "*)        suffix="man";;
-		*" script text"*)   suffix="sh";;
-		*" shared object"*) suffix="so";;
-		*" tar archive"*)   suffix="tar";;
-		*" Zip archive"*)   suffix="zip";;
-		*": data")          hexdump -C -- "$1"; return 0;;
-		*)                  return 1;;
-	esac
-	lesspipe "$1" ".${suffix}"
-	return 0
-}
-
-lesspipe() {
-	local match=$2
-	[[ -z ${match} ]] && match=$1
-
-	local DECOMPRESSOR=$(guesscompress "${match}")
-
-	# User filters
-	if [[ -x ~/.lessfilter ]] ; then
-		~/.lessfilter "$1" && exit 0
-	fi
-
-	local ignore
-	for ignore in ${LESSIGNORE} ; do
-		[[ ${match} == *.${ignore} ]] && exit 0
-	done
-
-	# Handle non-regular file types.
-	if [[ -d $1 ]] ; then
-		ls -alF -- "$1"
-		return
-	elif [[ ! -f $1 ]] ; then
-		# Only return if the stat passes.  This is needed to handle pseudo
-		# arguments like URIs.
-		stat -- "$1" && return
-	fi
-
-	case "${match}" in
-
-	### Doc files ###
-	*.[0-9n]|*.man|\
-	*.[0-9n].bz2|*.man.bz2|\
-	*.[0-9n].gz|*.man.gz|\
-	*.[0-9n].lzma|*.man.lzma|\
-	*.[0-9n].xz|*.man.xz|\
-	*.[0-9][a-z].gz|*.[0-9][a-z].gz)
-		local out=$(${DECOMPRESSOR} -- "$1" | file -)
-		case ${out} in
-			*troff*)
-				# Need to make sure we pass path to man or it will try
-				# to locate "$1" in the man search paths
-				if [[ $1 == /* ]] ; then
-					man -- "$1"
-				else
-					man -- "./$1"
-				fi
-				;;
-			*text*)
-				${DECOMPRESSOR} -- "$1"
-				;;
-			*)
-				# We could have matched a library (libc.so.6), so let
-				# `file` figure out what the hell this thing is
-				lesspipe_file "$1"
-				;;
-		esac
-		;;
-	*.dvi)      dvi2tty "$1" ;;
-	*.ps)       ps2ascii "$1" || pstotext "$1" ;;
-	*.pdf)      pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
-	*.doc)      antiword "$1" || catdoc "$1" ;;
-	*.rtf)      unrtf --nopict --text "$1" ;;
-	*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
-	*.json)     python -mjson.tool "$1" ;;
-
-	### URLs ###
-	ftp://*|http://*|https://|*.htm|*.html)
-		for b in elinks links2 links lynx ; do
-			${b} -dump "$1" && exit 0
-		done
-		html2text -style pretty "$1"
-		;;
-
-	### Tar files ###
-	*.tar|\
-	*.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\
-	*.tar.lz|*.tar.tlz|\
-	*.tar.lzma|*.tar.xz)
-		${DECOMPRESSOR} -- "$1" | tar tvvf -;;
-	*.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
-		lesspipe "$1" "$1.tar.${1##*.t}" ;;
-
-	### Misc archives ###
-	*.bz2|\
-	*.gz|*.z|\
-	*.lz|\
-	*.lzma|*.xz)  ${DECOMPRESSOR} -- "$1" ;;
-	*.rpm)        rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
-	*.cpi|*.cpio) cpio -itv < "$1" ;;
-	*.ace)        unace l "$1" ;;
-	*.arc)        arc v "$1" ;;
-	*.arj)        arj l -- "$1" || unarj l "$1" ;;
-	*.cab)        cabextract -l -- "$1" ;;
-	*.lha|*.lzh)  lha v "$1" ;;
-	*.zoo)        zoo -list "$1" || unzoo -l "$1" ;;
-	*.7z|*.exe)   7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
-	*.a)          ar tv "$1" ;;
-	*.elf)        readelf -a -W -- "$1" ;;
-	*.so)         readelf -h -d -s -W -- "$1" ;;
-	*.mo|*.gmo)   msgunfmt -- "$1" ;;
-
-	*.rar|.r[0-9][0-9])  unrar l -- "$1" ;;
-
-	*.jar|*.war|*.ear|*.xpi|*.zip)
-		unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1"
-		;;
-
-	*.deb|*.udeb)
-		if type -P dpkg > /dev/null ; then
-			dpkg --info "$1"
-			dpkg --contents "$1"
-		else
-			ar tv "$1"
-			ar p "$1" data.tar.gz | tar tzvvf -
-		fi
-		;;
-
-	### Filesystems ###
-	*.squashfs)   unsquashfs -s "$1" && unsquashfs -ll "$1" ;;
-
-	### Media ###
-	*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
-		identify -verbose -- "$1" || file -L -- "$1"
-		;;
-	*.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
-		midentify "$1" || file -L -- "$1"
-		;;
-	*.mp3)        mp3info "$1" || id3info "$1" ;;
-	*.ogg)        ogginfo "$1" ;;
-	*.flac)       metaflac --list "$1" ;;
-	*.torrent)    torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;;
-	*.bin|*.cue|*.raw)
-		# not all .bin/.raw files are cd images #285507
-		# fall back to lesspipe_file if .cue doesn't exist, or if
-		# cd-info failed to parse things sanely
-		[[ -e ${1%.*}.cue ]] \
-			&& cd-info --no-header --no-device-info "$1" \
-			|| lesspipe_file "$1"
-		;;
-	*.iso)
-		iso_info=$(isoinfo -d -i "$1")
-		echo "${iso_info}"
-		# Joliet output overrides Rock Ridge, so prefer the better Rock
-		case ${iso_info} in
-			*$'\n'"Rock Ridge"*) iso_opts="-R";;
-			*$'\n'"Joliet"*)     iso_opts="-J";;
-			*)                   iso_opts="";;
-		esac
-		isoinfo -l ${iso_opts} -i "$1"
-		;;
-
-	### Encryption stuff ###
-	*.crl) openssl crl -hash -text -noout -in "$1" ;;
-	*.csr) openssl req -text -noout -in "$1" ;;
-	*.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;;
-
-# May not be such a good idea :)
-#	### Device nodes ###
-#	/dev/[hs]d[a-z]*)
-#		fdisk -l "${1:0:8}"
-#		[[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
-#		;;
-
-	### Everything else ###
-	*)
-		case $(( recur++ )) in
-			# Maybe we didn't match due to case issues ...
-			0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
-
-			# Maybe we didn't match because the file is named weird ...
-			1) lesspipe_file "$1" ;;
-		esac
-
-		# So no matches from above ... finally fall back to an external
-		# coloring package.  No matching here so we don't have to worry
-		# about keeping in sync with random packages.  Any coloring tool
-		# you use should not output errors about unsupported files to
-		# stdout.  If it does, it's your problem.
-
-		# Allow people to flip color off if they dont want it
-		case ${LESSCOLOR} in
-			always)                   LESSCOLOR=2;;
-			[yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;;
-			[nN][oO]|[nN]|0|false)    LESSCOLOR=0;;
-			*)                        LESSCOLOR=0;; # default to no color #188835
-		esac
-		if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then
-			# 2: Only colorize if user forces it ...
-			# 1: ... or we know less will handle raw codes -- this will
-			#    not detect -seiRM, so set LESSCOLORIZER yourself
-			if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
-				LESSQUIET=true ${LESSCOLORIZER} "$1"
-			fi
-		fi
-
-		# Nothing left to do but let less deal
-		exit 0
-		;;
-	esac
-}
-
-if [[ $# -eq 0 ]] ; then
-	echo "Usage: lesspipe <file>"
-elif [[ $1 == "-V" || $1 == "--version" ]] ; then
-	cat <<-EOF
-		lesspipe (git)
-		Copyright 1999-2019 Gentoo Authors
-		Mike Frysinger <vapier@gentoo.org>
-		     (with plenty of ideas stolen from other projects/distros)
-
-	EOF
-	less -V
-elif [[ $1 == "-h" || $1 == "--help" ]] ; then
-	cat <<-EOF
-		lesspipe: preprocess files before sending them to less
-
-		Usage: lesspipe <file>
-
-		lesspipe specific settings:
-		  LESSCOLOR env     - toggle colorizing of output (no/yes/always; default: no)
-		  LESSCOLORIZER env - program used to colorize output (default: code2color)
-		  LESSIGNORE        - list of extensions to ignore (don't do anything fancy)
-
-		You can create per-user filters as well by creating the executable file:
-		  ~/.lessfilter
-		One argument is passed to it: the file to display.  The script should exit 0
-		to indicate it handled the file, or non-zero to tell lesspipe to handle it.
-
-		To use lesspipe, simply add to your environment:
-		  export LESSOPEN="|lesspipe %s"
-
-		Run 'less --help' or 'man less' for more info.
-	EOF
-else
-	recur=0
-	[[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null
-	lesspipe "$1"
-fi
diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-551.ebuild
deleted file mode 100644
index cfc0e10bf5e8..000000000000
--- a/sys-apps/less/less-551.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-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-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild
new file mode 100644
index 000000000000..1bd6c54437a8
--- /dev/null
+++ b/sys-apps/less/less-563-r1.ebuild
@@ -0,0 +1,44 @@
+# 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-r1.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-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
-}
-- 
cgit v1.2.3