From 2b0270bd6a9ce59f10badf34c2162bc816791f51 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Mon, 14 Mar 2011 15:00:50 -0300
Subject: p7zip-libre-9.20-1

---
 libre/p7zip-libre/PKGBUILD | 59 ++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 02311eeba..cbee2b234 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,64 +1,51 @@
-# $Id: PKGBUILD 85904 2010-07-22 04:49:57Z dgriffiths $
+# $Id$
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
-pkgver=9.13
-pkgrel=2
-pkgdesc="A command-line port of the 7zip compression utility without RAR"
+pkgver=9.20
+pkgrel=1
+pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://p7zip.sourceforge.net"
-depends=('gcc-libs' 'bash')
-options=(!emptydirs)
+url='http://p7zip.sourceforge.net/'
+makedepends=('yasm' 'nasm')
+source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
+        9.04-makefile.patch)
 provides=("p7zip=$pkgver")
-replaces=('p7zip')
 conflicts=('p7zip')
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2
-9.04-makefile.patch)
-md5sums=('8ddb5053db3b1f2696407d01be145779'
-'dc3e929ead20d7133fb3cc453aa62156')
-options=(!emptydirs)
-
+replaces=('p7zip')
+sha1sums=('c976df4543ea946a65bc3f5e3d4e9baa417e5f12'
+          '3a3333d4703955664fdd4023c624ab4828af0ab1')
 build() {
-	cd ${srcdir}/${_pkgname}_${pkgver}
+	cd "${srcdir}/${_pkgname}_${pkgver}"
 
     msg "Removing unRar"
 	sed -e '/Rar/d' -i makefile*
 	rm -rf CPP/7zip/Compress/Rar
 	patch -p1 -i $startdir/src/9.04-makefile.patch
 
-	#Arch64 fix
-	if [ "$CARCH" == "x86_64" ]; then
-		cp makefile.linux_amd64 makefile.machine
-	else
-		cp makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine
-	fi
-
+	[[ $CARCH = x86_64 ]] \
+	&& cp makefile.linux_amd64_asm makefile.machine \
+	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
 	sed -i "s|usr/local|usr|g" makefile
 
-	make all3 OPTFLAGS="${CXXFLAGS}" || return 1
+	make all3 OPTFLAGS="${CXXFLAGS}"
 }
 
 package() {
-	cd ${srcdir}/${_pkgname}_${pkgver}
+	cd "${srcdir}/${_pkgname}_${pkgver}"
 
-	make install DEST_HOME="${pkgdir}/usr" \
+	make install \
+		DEST_HOME="${pkgdir}/usr" \
 		DEST_MAN="${pkgdir}/usr/share/man" \
 		DEST_SHARE_DOC="http://www.bugaco.com/7zip"
 
-	mkdir -p ${pkgdir}/usr/share/doc/p7zip/DOCS
 	install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
-
-	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7z
-	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7za
-	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7zr
-
-	# Install mc's virtual filesystem
-	install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z \
-		${pkgdir}/usr/lib/mc/extfs.d/u7z
+	sed "s|${pkgdir}/usr|/usr|g" -i "${pkgdir}"/usr/bin/7z{,a,r}
+	install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
 }
-- 
cgit v1.2.3