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

Conflicts:
	community/calibre/PKGBUILD
	extra/ggz-client-libs/PKGBUILD
	extra/libggz/PKGBUILD

6 files changed, 77 insertions, 50 deletions

diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
index d04a5cbae..5c173cc62 100644
--- a/extra/ggz-client-libs/PKGBUILD
+++ b/extra/ggz-client-libs/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 123871 2011-05-14 00:20:19Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ggz-client-libs
 pkgver=0.0.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libggz>=0.0.14.1' 'expat>=2.0.1')
 options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('299eaa93721b1d867b5bf7dc6ac764b0')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 58e145256..332f24875 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 2130 2008-05-26 00:08:23Z eric $
+# $Id: PKGBUILD 123876 2011-05-14 00:23:46Z andrea $
 # Maintainer: 
 # Contributor: Jochem Kossen <j.kossen@home.nl>
+
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=10
+pkgrel=11
 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	patch_id3lib_3.8.3_UTF16_writing_bug.diff
-	id3lib-3.8.3-CVE-2007-4460.patch
-	id3lib-3.8.3-gcc-4.3.patch)
-md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '196c65adee1ba511ddacef2de0dfd102'\
-         '78e90e15ddd1122b66da352b6c3b00ff' 'fdbffd2d9d289ed0d730950c78d4ebc4')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'patch_id3lib_3.8.3_UTF16_writing_bug.diff'
+        'id3lib-3.8.3-CVE-2007-4460.patch'
+        'id3lib-3.8.3-gcc-4.3.patch')
+md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
+         '196c65adee1ba511ddacef2de0dfd102'
+         '78e90e15ddd1122b66da352b6c3b00ff'
+         'fdbffd2d9d289ed0d730950c78d4ebc4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/patch_id3lib_3.8.3_UTF16_writing_bug.diff || return 1
-  patch -Np0 -i ${startdir}/src/id3lib-3.8.3-CVE-2007-4460.patch || return 1
-  patch -Np1 -i ${startdir}/src/id3lib-3.8.3-gcc-4.3.patch || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+  patch -p0 -i "${srcdir}"/id3lib-3.8.3-CVE-2007-4460.patch
+  patch -p1 -i "${srcdir}"/id3lib-3.8.3-gcc-4.3.patch
   ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
index 3f2165793..22b350783 100644
--- a/extra/libggz/PKGBUILD
+++ b/extra/libggz/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 123866 2011-05-14 00:16:35Z andrea $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libggz
 pkgver=0.0.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.ggzgamingzone.org/"
 license=('LGPL')
 depends=('libgcrypt')
 options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('603739504648833779aa13b0327a1c3d')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 6852860be..cdb51f1cb 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119045 2011-04-10 17:31:05Z andyrtr $
+# $Id: PKGBUILD 123808 2011-05-13 10:30:31Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@gmail.com>
 # Contributor: Bjorn Martensen
 
 pkgname=libisofs
-pkgver=1.0.6
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('acl' 'zlib')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('85b8d2c9e378dc01c4b6039bcc1c6b43')
+md5sums=('b404e1deeee000d90efbf8ed60360412')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD
index bc4b87aaf..aca4645b3 100644
--- a/extra/webkit-sharp/PKGBUILD
+++ b/extra/webkit-sharp/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgname=webkit-sharp
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mono/.NET bindings for the WebKit rendering engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mono-project.com/"
 license=('custom:MIT')
-depends=('gtk-sharp-2' 'libwebkit')
+depends=('gtk-sharp-2' 'libwebkit>=1.4.0')
 makedepends=('pkgconfig>=0.9.0')
-source=(http://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('21482f9d5eafb0ef4acc6e790482f934')
 
 build() {
@@ -20,9 +20,15 @@ build() {
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/\.1/.2/' sources/webkit-sharp.dll.config.in
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0.7.0@:' sources/webkit-sharp.dll.config.in
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+
 }
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
index ce3f8e8a0..65db6d384 100644
--- a/extra/xscreensaver/PKGBUILD
+++ b/extra/xscreensaver/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113959 2011-03-10 22:37:48Z jgc $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 123881 2011-05-14 00:52:40Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jwz.org/xscreensaver/"
@@ -13,10 +13,14 @@ makedepends=('bc')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
         add-electricsheep.diff xscreensaver.pam LICENSE)
-md5sums=('0345c1acb9280729de05c5ca44b401e3' 'f82524626ed8a6832cd279e0548a9b46'\
-         '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('7252540b1b1853459a56453714c0974de26fa4c5' '65c2933380267475f2c4560bc22f4350393b00ce'\
-         '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134')
+md5sums=('a1a55b763e17c5c83a2b7cb5ddf23560'
+         'f82524626ed8a6832cd279e0548a9b46'
+         '367a3538f54db71f108b34cfa31088ac'
+         '5e7f3f2a63d20a484742f5b4cb5d572c')
+sha1sums=('3bdac6122e5b7b0cffcc90b3b75dc7fa001c0181'
+          '65c2933380267475f2c4560bc22f4350393b00ce'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"