Fri Jun 3 22:47:36 UTC 2011

5 files changed, 45 insertions, 33 deletions

diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index aac2684cc..3472e71a8 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 112728 2011-03-06 12:19:29Z andrea $
+# $Id: PKGBUILD 126252 2011-06-02 23:08:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="A web browser component for KDE"
 url="http://opendesktop.org/content/show.php?content=127960"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1a72499b91d668409ed8ea8e5e71b398')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=${pkgname}.git&a=snapshot&h=37bddda24735bb8eb2d9e324f983b8e84a45503e&fmt=tbz2")
+md5sums=('54c1fbb77f4a3c021b33a52a503fec8e')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index cad570d70..4545d82b8 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118083 2011-04-05 10:45:28Z andrea $
+# $Id: PKGBUILD 126247 2011-06-02 22:55:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
-pkgver=git20110405
+pkgver=0.7.5
 pkgrel=1
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url="http://www.vandenoever.info/software/strigi/"
 license=('GPL2')
 depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2')
 makedepends=('cmake' 'pkg-config')
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('dcc88c925c5ad264429ba841cab19b65')
+source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('0559e2ab65d187d30916e9ffe36e0fb6')
 options=('!libtool')
 
 build() {
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 0f9c0a70a..e4d352797 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121110 2011-04-29 01:29:30Z stephane $
+# $Id: PKGBUILD 126235 2011-06-02 19:57:23Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.6.15
+pkgver=1.6.17
 pkgrel=2
 pkgdesc="Replacement for CVS, another versioning system (SVN)"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime'
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
         subversion.rpath.fix.patch
-	subversion.suppress.deprecation.warnings.patch)
+        subversion.suppress.deprecation.warnings.patch)
 
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
@@ -23,13 +23,13 @@ options=('!makeflags' '!libtool')
 optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd "${srcdir}/${pkgname}-${pkgver}"
 
    export PYTHON=/usr/bin/python2
 
    # apply patches
-   patch -p0 < $srcdir/subversion.rpath.fix.patch
-   patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch
+   patch -Np0 -i ../subversion.rpath.fix.patch
+   patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
 
    # configure
    autoreconf
@@ -42,8 +42,14 @@ build() {
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
 }
 
+#check() {
+#   cd "${srcdir}/${pkgname}-${pkgver}"
+#   export LANG=C LC_ALL=C
+#   make check check-swig-pl check-swig-py CLEANUP=yes
+#}
+
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd "${srcdir}/${pkgname}-${pkgver}"
 
    # install
    export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
@@ -83,7 +89,7 @@ package() {
    install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
                ${pkgdir}/etc/bash_completion.d/subversion
 }
-md5sums=('113fca1d9e4aa389d7dc2b210010fa69'
+md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
          'a2b029e8385007ffb99b437b30521c90'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 1ce0f052a..6cf58ac50 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125773 2011-05-29 13:34:22Z thomas $
+# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.3
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -12,9 +12,9 @@ conflicts=('libv4l')
 license=('LGPL')
 makedepends=('qt')
 optdepends=('qt')
-depends=('glibc' 'gcc-libs' 'sysfsutils')
+depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5')
+sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,7 +28,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make install PREFIX="/usr" DESTDIR="${pkgdir}/"
   rm -f "${pkgdir}/usr/bin/ivtv-ctl"
-  # Fix udev rule location
-  mkdir -p "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib"
 }
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 64a547515..0f80af66a 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 114633 2011-03-14 21:00:40Z pierre $
+# $Id: PKGBUILD 126178 2011-06-02 11:13:57Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
-pkgver=4.3.11
-pkgrel=2
+pkgver=4.3.12
+pkgrel=1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -11,7 +11,7 @@ license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
 install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3225c7f53b69f395e95723585d6785ed')
+md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,6 +32,8 @@ build() {
 		--with-term-lib='ncursesw' \
 		--enable-multibyte \
 		--enable-function-subdirs \
+		--enable-fndir=/usr/share/zsh/functions \
+		--enable-scriptdir=/usr/share/zsh/scripts \
 		--with-tcsetpgrp \
 		--enable-pcre \
 		--enable-cap \
@@ -39,6 +41,13 @@ build() {
 	make
 }
 
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# This test wont work with the noatime mount option
+	rm Test/C02cond.ztst
+	HOME="${srcdir}" make check
+}
+
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}/" install