Fix bugs 18823 (lesspipe.sh misdetects troff files) and 38854 (lesspipe enchancments + cannot see some files with spaces). Thanks to Niels Teglsbo and Glen for the suggestions.

5 files changed, 94 insertions, 12 deletions

diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index a977dd6556a0..4f14ae69a40f 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/less
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.25 2004/06/11 13:41:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.26 2004/06/15 20:01:47 agriffis Exp $
+
+*less-382-r1 (15 Jun 2004)
+
+  15 Jun 2004; Aron Griffis <agriffis@gentoo.org> +files/lesspipe.sh-r2,
+  +less-382-r1.ebuild:
+  Fix bugs 18823 (lesspipe.sh misdetects troff files) and 38854
+  (lesspipe enchancments + cannot see some files with spaces).  Thanks
+  to Niels Teglsbo and Glen for the suggestions.
 
   11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> less-382.ebuild:
   Stable on alpha.
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 20f97ed6af74..928693e3129d 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,16 +1,19 @@
-MD5 32515bb3d8abcee28377e08f76ff9392 less-381.ebuild 947
+MD5 1002907002ece42cfc52e252d7ed0ce3 less-378-r2.ebuild 939
+MD5 2b421ad4a2929239513ac1ec3faf2859 less-382-r1.ebuild 805
+MD5 e6d5966f229edc8d976bf789f0e3ec65 less-381.ebuild 946
+MD5 3f6384ca55e16e3f4456f198ae47fa25 less-378-r1.ebuild 940
+MD5 aa92c0ed90060e5a61a6fb79e5176b4f less-376.ebuild 809
 MD5 b4d2b765738a3026570e5ec10fcdd546 less-382.ebuild 800
-MD5 907df6f820abbe76616869a31fb49400 less-378-r1.ebuild 941
-MD5 b752a9382bbaec40376072003df61812 less-378.ebuild 815
+MD5 03f942f19f697f247fb3fde755d1f8e0 less-378.ebuild 814
+MD5 94f08cd399277d82575f64c908955a59 ChangeLog 3612
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9a362e82a5b92adbe32e36a3db1a03d7 ChangeLog 3303
-MD5 c3e213fdc475477f1bbc045b28e1af76 less-376.ebuild 810
-MD5 c88b2af24128f95c032ef9c0b072b5f5 less-378-r2.ebuild 940
-MD5 ddd20ba8447e21d2e3d3368833c7180e files/digest-less-381 60
+MD5 0cc555c44c02b9b457e98ed39a63f1a2 files/lesspipe.sh-r1 1429
+MD5 e8ae2314e639439ffc73bbd6c0dff09e files/lesspipe.sh-r2 1270
+MD5 24c3d68ec84e1fcd23ef6d95b0105a76 files/lesspipe.sh 1429
+MD5 8769c7864189f8c6f30907d60f350789 files/digest-less-378-r1 246
+MD5 f60badb5a4f71f62a360a728d0757ecd files/digest-less-378-r2 246
+MD5 6f05cb473c8bd03fb8fb5ba7466aa804 files/digest-less-382-r1 60
 MD5 7b5bdd5f20fe55f32420ed4b3203c6ff files/digest-less-376 243
 MD5 400d2d4b02a4fda6b5b177877dade4eb files/digest-less-378 243
-MD5 f60badb5a4f71f62a360a728d0757ecd files/digest-less-378-r2 246
-MD5 8769c7864189f8c6f30907d60f350789 files/digest-less-378-r1 246
-MD5 24c3d68ec84e1fcd23ef6d95b0105a76 files/lesspipe.sh 1429
+MD5 ddd20ba8447e21d2e3d3368833c7180e files/digest-less-381 60
 MD5 6f05cb473c8bd03fb8fb5ba7466aa804 files/digest-less-382 60
-MD5 0cc555c44c02b9b457e98ed39a63f1a2 files/lesspipe.sh-r1 1429
diff --git a/sys-apps/less/files/digest-less-382-r1 b/sys-apps/less/files/digest-less-382-r1
new file mode 100644
index 000000000000..b6ee823b18a9
--- /dev/null
+++ b/sys-apps/less/files/digest-less-382-r1
@@ -0,0 +1 @@
+MD5 103fe4aef6297b93f0f73f38cc3b1bd7 less-382.tar.gz 264414
diff --git a/sys-apps/less/files/lesspipe.sh-r2 b/sys-apps/less/files/lesspipe.sh-r2
new file mode 100644
index 000000000000..af2e589164bf
--- /dev/null
+++ b/sys-apps/less/files/lesspipe.sh-r2
@@ -0,0 +1,41 @@
+#!/bin/bash
+# 
+# Preprocessor for 'less'. Used when this environment variable is set:
+# LESSOPEN="|lesspipe.sh %s"
+
+F=$1	# so we can use "set" later to play with positional params
+
+case "$F" in
+  *.tar.bz2) tar tjvvf "$F" 2>/dev/null ;;
+  *.tar.gz) tar tzvvf "$F" 2>/dev/null ;;
+  *.tar.z) tar tzvvf "$F" 2>/dev/null ;;
+  *.tar.Z) tar tzvvf "$F" 2>/dev/null ;;
+  *.tar) tar tvvf "$F" 2>/dev/null ;;
+  *.tbz2) tar tjvvf "$F" 2>/dev/null ;;
+  *.tbz) tar tjvvf "$F" 2>/dev/null ;;
+  *.tgz) tar tzvvf "$F" 2>/dev/null ;;
+  *.bz2) bzip2 -dc "$F" 2>/dev/null ;;
+  *.z) gzip -dc "$F"  2>/dev/null ;;
+  *.Z) gzip -dc "$F"  2>/dev/null ;;
+  *.zip) unzip -l "$F" 2>/dev/null ;;
+  *.rpm) rpm -qilp --changelog "$F" 2>/dev/null ;;
+  *.rar) unrar l "$F" 2>/dev/null ;;
+
+  *.[1-9] | *.n | *.man)
+  	[[ $(file -L "$F") == *troff* ]] && \
+    groff -S -s -p -t -e -Tascii -mandoc "$F" 2>/dev/null ;;
+
+  *.[1-9].gz | *.n.gz | *.man.gz)
+  	[[ $(gzip -dc "$F" 2>/dev/null | file -) == *troff* ]] && \
+    gzip -dc "$F" 2>/dev/null | groff -S -s -p -t -e -Tascii -mandoc ;;
+
+  # keep this *after* testing for gzipped troff
+  *.gz) gzip -dc "$F"  2>/dev/null ;;
+
+  *)
+	set -- $(file -L "$F")
+	if [[ $2 == Linux/* || $3 == Linux/* || $2 == ELF || $3 == ELF ]]; then
+		strings $F
+	fi
+	;;
+esac
diff --git a/sys-apps/less/less-382-r1.ebuild b/sys-apps/less/less-382-r1.ebuild
new file mode 100644
index 000000000000..5d47e4c356ef
--- /dev/null
+++ b/sys-apps/less/less-382-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r1.ebuild,v 1.1 2004/06/15 20:01:47 agriffis Exp $
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE=""
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
+
+src_install() {
+	dobin less lessecho lesskey || die
+	newbin ${FILESDIR}/lesspipe.sh-r2 lesspipe.sh
+
+	# Needed for groff-1.18 and later ...
+	dodir /etc/env.d
+	echo "LESS=\"-R\"" > ${D}/etc/env.d/70less
+
+	newman lesskey.nro lesskey.1
+	newman less.nro less.1
+
+	dodoc NEWS README
+}