arm stable and clean up

7 files changed, 35 insertions, 126 deletions

diff --git a/sys-apps/less/files/digest-less-378-r1 b/sys-apps/less/files/digest-less-378-r1
deleted file mode 100644
index 43f7295d71c2..000000000000
--- a/sys-apps/less/files/digest-less-378-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0cc555c44c02b9b457e98ed39a63f1a2 /files/lesspipe.sh-r1 1429
-MD5 24c3d68ec84e1fcd23ef6d95b0105a76 /files/lesspipe.sh 1429
-MD5 41a3db9f6da6ae69df843845e46d0cbc /less-378-r1.ebuild 934
-MD5 db73e39a2d1a68eafa949f80be5a28c8 less-378.tar.gz 244971
diff --git a/sys-apps/less/files/digest-less-378-r2 b/sys-apps/less/files/digest-less-378-r2
deleted file mode 100644
index f2de4fff8044..000000000000
--- a/sys-apps/less/files/digest-less-378-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0cc555c44c02b9b457e98ed39a63f1a2 /files/lesspipe.sh-r1 1429
-MD5 24c3d68ec84e1fcd23ef6d95b0105a76 /files/lesspipe.sh 1429
-MD5 edd445012ab3dedfe7c048eb518b407d /less-378-r2.ebuild 935
-MD5 db73e39a2d1a68eafa949f80be5a28c8 less-378.tar.gz 244971
diff --git a/sys-apps/less/files/digest-less-381 b/sys-apps/less/files/digest-less-381
deleted file mode 100644
index a7af13719602..000000000000
--- a/sys-apps/less/files/digest-less-381
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40c2dd4ac137b61b6a55a6478817daf4 less-381.tar.gz 265474
diff --git a/sys-apps/less/files/digest-less-382 b/sys-apps/less/files/digest-less-382
deleted file mode 100644
index b6ee823b18a9..000000000000
--- a/sys-apps/less/files/digest-less-382
+++ /dev/null
@@ -1 +0,0 @@
-MD5 103fe4aef6297b93f0f73f38cc3b1bd7 less-382.tar.gz 264414
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index f9c77ab580ff..4710daa9f6ba 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -1,41 +1,44 @@
-#!/bin/sh
-
+#!/bin/bash
+# 
 # Preprocessor for 'less'. Used when this environment variable is set:
 # LESSOPEN="|lesspipe.sh %s"
 
-lesspipe() {
+trap 'exit 0' PIPE
+
+F=$1	# so we can use "set" later to play with positional params
 
-  case "$1" in
+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 ;;
 
-  *.bz2) bzip2 -dc $1 2>/dev/null ;;
-  *.tar) tar tvvf $1 2>/dev/null ;;
-  *.tar.bz2) tar tjvvf $1 2>/dev/null ;;
-  *.tbz2) tar tjvvf $1 2>/dev/null ;;
-  *.tbz) tar tjvvf $1 2>/dev/null ;;
-  *.tar.gz) tar tzvvf $1 2>/dev/null ;;
-  *.tgz) tar tzvvf $1 2>/dev/null ;;
-  *.z) gzip -dc $1  2>/dev/null ;;
-  *.Z) gzip -dc $1  2>/dev/null ;;
-  *.tar.z) tar tzvvf $1 2>/dev/null ;;
-  *.tar.Z) tar tzvvf $1 2>/dev/null ;;
-  *.zip) unzip -l $1 2>/dev/null ;;
-  *.rpm) rpm -qilp "$1" 2>/dev/null ;;
   *.[1-9] | *.n | *.man)
-    [ "$(file -L $1 | cut -d ' ' -f 2)" = "troff" -o \
-    "$(file -L $1 | cut -d ' ' -f 2)" = "ASCII" ] &&
-    groff -S -s -p -t -e -Tascii -mandoc "$1" 2>/dev/null ;;
+  	[[ $(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 $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "troff" -o \
-    "$(gzip -dc $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "ASCII" ] &&
-    gzip -dc $1 2>/dev/null | groff -S -s -p -t -e -Tascii -mandoc ;;
-  *.gz) gzip -dc $1  2>/dev/null ;; # keep this after the above statement :)
-  *) FILE="$(file -L $1)"
-    FILE1="$(echo $FILE | cut -d ' ' -f 2)"
-    FILE2="$(echo $FILE | cut -d ' ' -f 3)"
-    [ "$FILE1" = "Linux/i386" -o "$FILE2" = "Linux/i386" -o \
-      "$FILE1" = "ELF" -o "$FILE2" = "ELF" ] && strings $1 ;;
+  	[[ $(gzip -dc "$F" 2>/dev/null | file -) == *troff* ]] && \
+    gzip -dc "$F" 2>/dev/null | groff -S -s -p -t -e -Tascii -mandoc ||
+    gzip -dc "$F" 2>/dev/null ;;
 
-  esac
-}
+  # keep this *after* testing for gzipped troff
+  *.gz) gzip -dc "$F"  2>/dev/null ;;
 
-lesspipe $1
+  *)
+	set -- $(file -L "$F")
+	if [[ $2 == Linux/* || $3 == Linux/* || $2 == ELF || $3 == ELF ]]; then
+		strings "$F"
+	fi
+	;;
+esac
diff --git a/sys-apps/less/files/lesspipe.sh-r1 b/sys-apps/less/files/lesspipe.sh-r1
deleted file mode 100644
index a647ac1b51b1..000000000000
--- a/sys-apps/less/files/lesspipe.sh-r1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Preprocessor for 'less'. Used when this environment variable is set:
-# LESSOPEN="|lesspipe.sh %s"
-
-lesspipe() {
-
-  case "$1" in
-
-  *.tar.bz2) tar tjvvf $1 2>/dev/null ;;
-  *.bz2) bzip2 -dc $1 2>/dev/null ;;
-  *.tar) tar tvvf $1 2>/dev/null ;;
-  *.tbz2) tar tjvvf $1 2>/dev/null ;;
-  *.tbz) tar tjvvf $1 2>/dev/null ;;
-  *.tar.gz) tar tzvvf $1 2>/dev/null ;;
-  *.tgz) tar tzvvf $1 2>/dev/null ;;
-  *.tar.z) tar tzvvf $1 2>/dev/null ;;
-  *.tar.Z) tar tzvvf $1 2>/dev/null ;;
-  *.z) gzip -dc $1  2>/dev/null ;;
-  *.Z) gzip -dc $1  2>/dev/null ;;
-  *.zip) unzip -l $1 2>/dev/null ;;
-  *.rpm) rpm -qilp "$1" 2>/dev/null ;;
-  *.[1-9] | *.n | *.man)
-    [ "$(file -L $1 | cut -d ' ' -f 2)" = "troff" -o \
-    "$(file -L $1 | cut -d ' ' -f 2)" = "ASCII" ] &&
-    groff -S -s -p -t -e -Tascii -mandoc "$1" 2>/dev/null ;;
-  *.[1-9].gz | *.n.gz | *.man.gz)
-    [ "$(gzip -dc $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "troff" -o \
-    "$(gzip -dc $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "ASCII" ] &&
-    gzip -dc $1 2>/dev/null | groff -S -s -p -t -e -Tascii -mandoc ;;
-  *.gz) gzip -dc $1  2>/dev/null ;; # keep this after the above statement :)
-  *) FILE="$(file -L $1)"
-    FILE1="$(echo $FILE | cut -d ' ' -f 2)"
-    FILE2="$(echo $FILE | cut -d ' ' -f 3)"
-    [ "$FILE1" = "Linux/i386" -o "$FILE2" = "Linux/i386" -o \
-      "$FILE1" = "ELF" -o "$FILE2" = "ELF" ] && strings $1 ;;
-
-  esac
-}
-
-lesspipe $1
diff --git a/sys-apps/less/files/lesspipe.sh-r2 b/sys-apps/less/files/lesspipe.sh-r2
deleted file mode 100644
index 1663589397b2..000000000000
--- a/sys-apps/less/files/lesspipe.sh-r2
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# 
-# Preprocessor for 'less'. Used when this environment variable is set:
-# LESSOPEN="|lesspipe.sh %s"
-
-trap 'exit 0' PIPE
-
-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