Wed Nov 16 23:15:06 UTC 2011

10 files changed, 61 insertions, 88 deletions

diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD
index 66000ef1f..4135c242f 100644
--- a/extra/attica/PKGBUILD
+++ b/extra/attica/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 142782 2011-11-15 06:11:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=attica
-pkgver=0.2.0
+pkgver=0.2.9
 pkgrel=1
 pkgdesc='A library to access Open Collaboration Service providers'
 arch=('i686' 'x86_64')
@@ -11,10 +11,10 @@ license=('LGPL')
 depends=('qt')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('df3dcea0229cfa31539bdd427976e15b')
+md5sums=('7dadb6ca7dec09f89d41cd868ea6dc39')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +24,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index 5dc117c4f..a793618de 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 138088 2011-09-16 07:43:49Z ibiru $
+# $Id: PKGBUILD 142786 2011-11-15 06:28:23Z eric $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=gtk-vnc
-pkgver=0.4.3
-pkgrel=2
+pkgver=0.4.4
+pkgrel=1
 pkgdesc="A VNC viewer widget for GTK"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/gtk-vnc"
 license=('LGPL')
-depends=('gtk3')
+depends=('libgcrypt' 'gtk3')
 optdepends=('gtk2: GTK2 widget')
-makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2')
+makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7')
 
 build() {
   cd "$srcdir"
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index eb6325f6e..0acf293b5 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 137565 2011-09-09 17:36:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 142810 2011-11-15 16:35:49Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmygpo-qt
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="A C++/Qt client library for gpodder.net"
 arch=('i686' 'x86_64')
@@ -11,13 +12,13 @@ license=('LGPL2.1')
 depends=('qjson')
 makedepends=('cmake')
 source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz")
-md5sums=('9c840d6a7dc96055c6eb5a7d36d02a7c')
+md5sums=('37af04b1e944f982e35b69c04b5d1b0f')
 
 build() {
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../${pkgname}.${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 85094853c..8f4cdbe1a 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 140480 2011-10-15 10:32:49Z andyrtr $
+# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 
 pkgname=midori
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 arch=('i686' 'x86_64')
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license=('LGPL2.1')
 install=midori.install
-depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2')
+depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('33dde203cd71ae2b1d2adcc7f5739f65')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   # python2 
   export PYTHON=/usr/bin/python2
@@ -35,6 +35,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/midori/midori.install b/extra/midori/midori.install
index 8cee6c198..4da5511fd 100644
--- a/extra/midori/midori.install
+++ b/extra/midori/midori.install
@@ -1,7 +1,6 @@
 post_install() {
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
 
 post_upgrade() {
@@ -9,6 +8,5 @@ post_upgrade() {
 }
 
 post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+  post_install $1
 }
diff --git a/extra/nouveau-drm-lts/PKGBUILD b/extra/nouveau-drm-lts/PKGBUILD
index 1284563f4..d037a33ea 100644
--- a/extra/nouveau-drm-lts/PKGBUILD
+++ b/extra/nouveau-drm-lts/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 126820 2011-06-07 13:57:50Z tpowa $
+# $Id: PKGBUILD 142808 2011-11-15 14:48:15Z tpowa $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=nouveau-drm-lts
 _snapdate=20100313
 pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
-_kernver='2.6.32-lts'
-pkgrel=6
+_extramodules=extramodules-2.6.32-lts
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=7
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -34,14 +35,14 @@ build() {
 }
 
 package() {
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko
 
   # install script
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install
   # gzip -9 modules
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
diff --git a/extra/nouveau-drm-lts/nouveau-drm.install b/extra/nouveau-drm-lts/nouveau-drm.install
index beadaa563..2aa581d47 100644
--- a/extra/nouveau-drm-lts/nouveau-drm.install
+++ b/extra/nouveau-drm-lts/nouveau-drm.install
@@ -1,6 +1,6 @@
 post_install() {
-  KERNEL_VERSION='2.6.32-lts'
-  depmod -v $KERNEL_VERSION  > /dev/null 2>&1
+  EXTRAMODULES='extramodules-2.6.32-lts'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)  
   echo "if you are running kms in early mode please rebuild your initrd"
 }
 
@@ -10,7 +10,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.32-lts'
-  depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
+  EXTRAMODULES='extramodules-2.6.32-lts'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 2f73f333a..01bedf9e0 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 134573 2011-08-06 08:14:08Z andrea $
+# $Id: PKGBUILD 142784 2011-11-15 06:17:05Z andrea $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
 url="http://librdf.org/raptor"
-depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26')
+depends=('curl>=7.22.0' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
-md5sums=('46eff4b20f8752d1146a3e0c8b2168dd')
+md5sums=('ffa2aa82c83dbd5b1f77835348ed2c2a')
 
 build() {
   cd "${srcdir}"/raptor2-${pkgver}
@@ -28,4 +28,3 @@ package() {
   cd "${srcdir}"/raptor2-${pkgver}
   make prefix="${pkgdir}"/usr install
 }
-md5sums=('0373efb8d85dc872bc7bb5b1c69299fb')
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index a181f374c..82a55f4d2 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126782 2011-06-07 10:02:00Z allan $
+# $Id: PKGBUILD 142827 2011-11-16 03:17:22Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
-pkgver=3.6.1
-pkgrel=2
+pkgver=3.7.0
+pkgrel=1
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,25 +12,12 @@ url="http://valgrind.org/"
 depends=('glibc>=2.14' 'glibc<2.15' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.6.1-glibc-2.14.patch
-        glibc-patch-version.patch)    
-md5sums=('2c3aa122498baecc9d69194057ca88f5'
-         '560032ce5d27ef0c7c1af32c3fd45833'
-         'b657f0ebdde3d9aefc9fd16f9e653702')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a855fda56edf05614f099dca316d1775')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # make sure our CFLAGS are respected
-  sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
-
-  # glibc-2.14 compatibility
-  patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch
-
-  # prevent need to rebuild with glibc patch level version bumps
-  patch -Np1 -i ${srcdir}/glibc-patch-version.patch
-
   if [ "${CARCH}" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 2f7159754..50c250b72 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142648 2011-11-12 17:15:49Z ibiru $
+# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
-pkgver=1.1.19
-pkgrel=6
+pkgver=1.1.20
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
@@ -25,28 +25,15 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libmng: for using the mng plugin' \
             'aalib: for using the aalib plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch
-        xine-lib-1.1.19-ffmpeg.patch)
-sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d'
-          '121a8358d7919b2e51067412373f52848290338a'
-          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34'
-          'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch"
-  patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch"
   sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
-    configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
-
-  libtoolize --force --copy
-  aclocal -I m4
-  autoconf
-  automake --add-missing
-
-  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
+    configure src/input/input_v4l.c src/video_out/video_out_syncfb.h
+  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \
+    --disable-optimizations
   make
 }