Merge branch 'master' of ssh://gparabola/abslibre-mips64el

4 files changed, 51 insertions, 32 deletions

diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 817f7c7d7..b4a3c295d 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150154 2012-02-13 15:50:03Z ronald $
+# $Id: PKGBUILD 154510 2012-03-29 17:58:41Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.5.4
+pkgver=5.5.5
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
@@ -15,19 +15,16 @@ depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
-	'0001-set-MTU-via-sysfs-if-file-is-available.patch')
-sha1sums=('8aa42abd28d49cce5b179998490c36f6c490e338'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
-          'ee85adac972a8172a9d9b3a1bdd46e0430301582'
-          'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
+        'dhcpcd.conf.d')
+sha1sums=('1856ad1535f2c7551cefcb492af24d345c6a1b50'
+          'b67b9ce6a2faaca75fea356966a16be2283b7db0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # remove net-tools dep
-  patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch
-  patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
+  # remove net-tools dep (upstream now)
+#  patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch
+#  patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
 
   # configure variables
   ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index 7b2003a56..5e8fe1088 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 154386 2012-03-27 12:00:15Z bisson $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 154487 2012-03-29 08:18:37Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.0.18
-pkgrel=2
+pkgver=2.0.19
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -16,29 +17,30 @@ optdepends=('curl: gpg2keys_curl'
             'texinfo: documentation')
 makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
-install=${pkgname}.install
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
-sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
-          'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
+          'f6e6830610a8629b0aad69d789373bf8ca481733')
+
+install=install
 
 conflicts=('gnupg2')
 provides=("gnupg2=${pkgver}")
 replaces=('gnupg2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+	make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-  ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
 }
diff --git a/core/gnupg/install b/core/gnupg/install
new file mode 100644
index 000000000..3a5dc9fd6
--- /dev/null
+++ b/core/gnupg/install
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD
index c00db6b7d..d7d705592 100644
--- a/core/sqlite3/PKGBUILD
+++ b/core/sqlite3/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 147078 2012-01-21 15:49:21Z andyrtr $
+# $Id: PKGBUILD 154652 2012-03-30 14:26:35Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite3"
 pkgname=('sqlite3' 'sqlite3-tcl')
-_amalgamationver=3071000
+_amalgamationver=3071100
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
 #pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.10
+pkgver=3.7.11
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('9ed2ca93577b58cfa0d01f64b9312ab9'
+md5sums=('0552d71bda98ebdcaea305cd6058221b'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {