Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/shotwell/PKGBUILD
	community-testing/texmaker/PKGBUILD
	community/i3lock/PKGBUILD
	core/dnsutils/PKGBUILD
	core/expat/PKGBUILD
	core/iptables/PKGBUILD
	extra/ntp/PKGBUILD
	extra/talloc/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/lib32-udev/PKGBUILD

3 files changed, 135 insertions, 0 deletions

diff --git a/multilib/lib32-gmp/538dfce27f41.patch b/multilib/lib32-gmp/538dfce27f41.patch
new file mode 100644
index 000000000..2e0a1af50
--- /dev/null
+++ b/multilib/lib32-gmp/538dfce27f41.patch
@@ -0,0 +1,38 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1310730221 -7200
+# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
+# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
+(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
+
+diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
+--- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
++++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
+@@ -7,7 +7,7 @@
+    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+ 
+-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+@@ -28,7 +28,6 @@
+ #include "gmp-impl.h"
+ 
+ 
+-
+ mp_size_t
+ mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
+ {
+@@ -130,7 +129,7 @@
+       qn = nn - qn;
+       while (qn > dn)
+ 	{
+-	  mpn_sub_1 (np + dn, np + dn, qn, cy);
++	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
+ 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
+ 	  qp += dn;
+ 	  np += dn;
+
diff --git a/multilib/lib32-gmp/PKGBUILD b/multilib/lib32-gmp/PKGBUILD
new file mode 100644
index 000000000..e936bf098
--- /dev/null
+++ b/multilib/lib32-gmp/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 135478 2011-08-14 09:26:08Z allan $
+# Maintainer: Florian Pritz <flo@xssn.at>
+# Contributor: josephgbr <rafael.f.f1 at gmail dot com>
+
+_pkgbasename=gmp
+pkgname=lib32-$_pkgbasename
+pkgver=5.0.2
+pkgrel=4
+pkgdesc="A free library for arbitrary precision arithmetic (32-bit)"
+arch=('i686' 'x86_64')
+url="http://gmplib.org/"
+depends=('lib32-gcc-libs' $_pkgbasename)
+makedepends=(gcc-multilib)
+license=('LGPL3')
+options=(!libtool)
+source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2
+        538dfce27f41.patch)
+md5sums=('0bbaedc82fb30315b06b1588b9077cd3'
+         'a769be9c41618ca9c35d83375e7097d0')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  patch -Np1 -i $srcdir/538dfce27f41.patch
+
+  export ABI=32
+  ./configure \
+    --prefix=/usr --infodir=/usr/share/info \
+    --enable-cxx --libdir=/usr/lib32
+
+  #Put gmp.h in the same folder as gmpxx.h
+  sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile
+
+  make
+}
+
+check() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+}
diff --git a/multilib/lib32-nettle/PKGBUILD b/multilib/lib32-nettle/PKGBUILD
new file mode 100644
index 000000000..6b226d319
--- /dev/null
+++ b/multilib/lib32-nettle/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 58144 2011-11-06 22:21:54Z bluewind $
+# Maintainer: Florian Pritz <flo@xssn.at>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: bender02 at gmx dot com
+
+_pkgbasename=nettle
+pkgname=lib32-$_pkgbasename
+pkgver=2.4
+pkgrel=1
+pkgdesc="A low-level cryptographic library (32-bit)"
+arch=('i686' 'x86_64')
+url="http://www.lysator.liu.se/~nisse/nettle/"
+license=('GPL2')
+depends=('lib32-gmp' $_pkgbasename)
+makedepends=(gcc-multilib)
+source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$_pkgbasename-$pkgver.tar.gz)
+md5sums=(''450be8c4886d46c09f49f568ad6fa013'')
+
+build() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+	--enable-shared \
+	--disable-static # <-- seems not working now
+  make
+}
+
+check() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  find $pkgdir
+  
+  # remove static libs
+  rm -f ${pkgdir}/usr/lib32/{libhogweed,libnettle}.a
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+}