From 6fe37f4d0d58fef7e918c59a8c22a2d7169db64d Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Fri, 30 Dec 2011 22:34:36 +0100
Subject: Update p7zip, remove its unzip replacement to not conflict with
 unzip-libre.

---
 libre/p7zip-libre/7zFM.desktop |  1 -
 libre/p7zip-libre/PKGBUILD     | 33 ++++++++++++++-------------------
 libre/p7zip-libre/install      |  1 -
 libre/p7zip-libre/unzip        | 18 ------------------
 4 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100755 libre/p7zip-libre/unzip

diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop
index 9d8e72920..62b8e8562 100644
--- a/libre/p7zip-libre/7zFM.desktop
+++ b/libre/p7zip-libre/7zFM.desktop
@@ -7,4 +7,3 @@ Categories=GTK;Utility;Archiving;Compression;
 Terminal=false
 Icon=p7zip
 Exec=7zFM
-
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 61d0d5d71..2e6ab6e01 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -8,25 +8,24 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=4
+pkgrel=6
 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
-provides=("p7zip=$pkgver" 'unzip')
-conflicts=('p7zip' 'unzip')
-replaces=('p7zip' 'unzip')
+arch=('i686' 'x86_64' 'mips64el')
+provides=("p7zip=$pkgver")
+conflicts=('p7zip')
+replaces=('p7zip')
+depends=('gcc-libs' 'bash')
 optdepends=('wxgtk: GUI'
             'desktop-file-utils: desktop entries')
 makedepends=('yasm' 'nasm' 'wxgtk')
 source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2"
         'p7zip-libre.patch'
-        'unzip' # unzip replacement
         '7zFM.desktop')
-md5sums=('c1eaf537e382b93adaa64713c96089fb'
-         '5b938c94cf80179137ea560dde510951'
-         '371af657bfb81a97bbeb5439896c814a'
-         '5b1c13139c42024d73abb67708ab6864')
+sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9'
+          '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
+          'f2c370d6f1b286b7ce9a2804e22541b755616a40')
 install=install
 
 mksource() {
@@ -52,11 +51,12 @@ mksource() {
 build() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
 
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+        case $CARCH in
+            x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
+            i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
+        esac
 
-	make all4 OPTFLAGS="${CXXFLAGS}"
+        make all4 OPTFLAGS="${CXXFLAGS}"
 }
 
 package() {
@@ -68,7 +68,6 @@ package() {
 		DEST_MAN="/usr/share/man"
 
 	# Integration with stuff...
-	install -D contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
 	install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
 	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
 	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
@@ -79,8 +78,4 @@ package() {
 	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
 
 	chmod -R u+w "${pkgdir}/usr"
-
-# Install unzip replacement script
-    install -D -m755 "${srcdir}/unzip" "${pkgdir}/usr/bin/unzip"
 }
-
diff --git a/libre/p7zip-libre/install b/libre/p7zip-libre/install
index 2502df4a6..7f3cc4358 100644
--- a/libre/p7zip-libre/install
+++ b/libre/p7zip-libre/install
@@ -11,4 +11,3 @@ post_upgrade() {
 post_remove() {
 	post_install
 }
-
diff --git a/libre/p7zip-libre/unzip b/libre/p7zip-libre/unzip
deleted file mode 100755
index 201dc826c..000000000
--- a/libre/p7zip-libre/unzip
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash 
-# unzip replacement written by Henry Jensen <hjensen@gmx.de>
-
-Opts="" 
-cm="x" 
-while getopts plvtTZ opt 
-do 
- case $opt in 
- p) Opts="$Opts -so";; 
- v|l) cm="l";; 
- t) cm="t";; 
- T|Z) ;; 
- \?)break;; 
- esac 
-done 
-shift $((OPTIND-1)) 
-
-7z $cm $Opts "$@" 
-- 
cgit v1.2.3