lesspipe-1.83-1.parabola1: updating version

2 files changed, 7 insertions, 117 deletions

diff --git a/libre/lesspipe/PKGBUILD b/libre/lesspipe/PKGBUILD
index 942b526de..cd1d317a9 100644
--- a/libre/lesspipe/PKGBUILD
+++ b/libre/lesspipe/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 130024 2015-03-27 10:04:07Z spupykin $
+# $Id: PKGBUILD 138775 2015-08-26 07:05:31Z spupykin $
 # Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=lesspipe
-pkgver=1.82
-pkgrel=3.parabola1
-pkgdesc='an input filter for the pager less, with libarchive support'
+pkgver=1.83
+pkgrel=1.parabola1
+pkgdesc='an input filter for the pager less, with libarchive recommendation'
 depends=('less')
 arch=('any')
 license=('GPL')
@@ -26,19 +26,9 @@ optdepends=('perl'
 	    'imagemagick: support for some image file')
 url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
 source=("http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz"
-	"html2text.patch::https://bugs.archlinux.org/task/44365?getfile=12856"
-	lesspipe.sh
-	libarchive.patch)
-md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56'
-         '4bb768cae4723b3719a70848d36cf5fe'
-         '675b56f560c600f43108adfd98222251'
-         'ec452ea980d5c1e254e9775fd424c18c')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/html2text.patch
-  patch -Np1 -i ../libarchive.patch
-}
+	lesspipe.sh)
+md5sums=('fff7da88b9af45497c493a1682c67652'
+         '675b56f560c600f43108adfd98222251')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/libre/lesspipe/libarchive.patch b/libre/lesspipe/libarchive.patch
deleted file mode 100644
index b4fb48788..000000000
--- a/libre/lesspipe/libarchive.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/configure b/configure
-index cbd34af..5df4a31 100755
---- a/configure
-+++ b/configure
-@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N	# always interpret textlike files (html, ...)
- # compression programs
- bzip2		Y	# include bzip2 and unzip code, it is fairly essential
- unzip		Y
--rar		Y
--unrar		Y
-+bsdtar		Y	# bsdtar is the best free as in freedom alternative for rar
- lzip		N	# default for lzma, lzip, xz, 7za should probably be N
- lzma		Y
- xz		Y
-diff --git a/lesspipe.sh b/lesspipe.sh
-index c80c75b..262a47b 100755
---- a/lesspipe.sh
-+++ b/lesspipe.sh
-@@ -276,12 +276,8 @@ get_cmd () {
-       cmd=(isrpm "$2" "$file2")
-     elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then
-       cmd=(istemp "unzip -avp" "$2" "$file2")
--    elif [[ "$1" = *RAR\ archive* ]]; then
--      if cmd_exist unrar; then
--        cmd=(istemp "unrar p -inul" "$2" "$file2")
--      elif cmd_exist rar; then
--        cmd=(istemp "rar p -inul" "$2" "$file2")
--      fi
-+    elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then
-+      cmd=(bsdtar xOf "$2" "$file2")
-     elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then
-       cmd=(istemp "7za e -so" "$2" "$file2")
-     elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then
-@@ -534,14 +530,9 @@ isfinal() {
-   elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then
-     msg "use zip_file${sep}contained_file to view a file in the archive"
-     istemp "unzip -lv" "$2"
--  elif [[ "$1" = *RAR\ archive* ]]; then
--    if cmd_exist unrar; then
--      msg "use rar_file${sep}contained_file to view a file in the archive"
--      istemp "unrar v" "$2"
--    elif cmd_exist rar; then
--      msg "use rar_file${sep}contained_file to view a file in the archive"
--      istemp "rar v" "$2"
--    fi 
-+  elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then
-+    msg "use rar_file${sep}contained_file to view a file in the archive"
-+    bsdtar tf "$2"
-   elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then
-     typeset res
-     res=$(istemp "7za l" "$2")
-diff --git a/lesspipe.sh.in b/lesspipe.sh.in
-index 407bc7d..753f3c5 100755
---- a/lesspipe.sh.in
-+++ b/lesspipe.sh.in
-@@ -323,17 +323,10 @@ get_cmd () {
-     elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then
-       set -A cmd istemp "unzip -avp" "$2" "$file2"
- #endif 
--#ifdef unrar
--    elif [[ "$1" = *RAR\ archive* ]]; then
--      if cmd_exist unrar; then
--        set -A cmd istemp "unrar p -inul" "$2" "$file2"
--      elif cmd_exist rar; then
--        set -A cmd istemp "rar p -inul" "$2" "$file2"
--      fi
--#elif rar
--    elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then
--      set -A cmd istemp "rar p -inul" "$2" "$file2"
--#endif 
-+#ifdef bsdtar
-+    elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then
-+      set -A cmd bsdtar xOf "$2" "$file2"
-+#endif
- #ifdef 7za
-     elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then
-       set -A cmd istemp "7za e -so" "$2" "$file2"
-@@ -705,19 +698,10 @@ isfinal() {
-     msg "use zip_file${sep}contained_file to view a file in the archive"
-     istemp "unzip -lv" "$2"
- #endif
--#ifdef unrar
--  elif [[ "$1" = *RAR\ archive* ]]; then
--    if cmd_exist unrar; then
--      msg "use rar_file${sep}contained_file to view a file in the archive"
--      istemp "unrar v" "$2"
--    elif cmd_exist rar; then
--      msg "use rar_file${sep}contained_file to view a file in the archive"
--      istemp "rar v" "$2"
--    fi 
--#elif rar
--  elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then
-+#ifdef bsdtar
-+  elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then
-     msg "use rar_file${sep}contained_file to view a file in the archive"
--    istemp "rar v" "$2"
-+    bsdtar tf "$2"
- #endif
- #ifdef 7za
-   elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then