Wed Jun 1 22:46:45 UTC 2011

12 files changed, 50 insertions, 66 deletions

diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index f6cefe7b7..9c01a5c61 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124267 2011-05-18 16:31:02Z andrea $
+# $Id: PKGBUILD 125928 2011-05-31 21:48:19Z andrea $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64')
 url="http://tedfelix.com/linux/acpid-netlink.html"
@@ -39,5 +39,5 @@ package() {
 md5sums=('d5dd88bcfaa4a0bf51905e95115da6df'
          '955490c4db5233ec44461db694b873a4'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '7b2e4c299af5eb87e1a81c07b6916c97'
+         '24bd717aeb6b628a144b6956ff661ab0'
          '929c6d2e91295c22ed9ec6212d7eabef')
diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh
index 518a62dea..8256e76a6 100644
--- a/extra/acpid/handler.sh
+++ b/extra/acpid/handler.sh
@@ -14,8 +14,8 @@ case "$1" in
     button/power)
         #echo "PowerButton pressed!">/dev/tty5
         case "$2" in
-            PWRF)   logger "PowerButton pressed: $2" ;;
-            *)      logger "ACPI action undefined: $2" ;;
+            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
+            *)          logger "ACPI action undefined: $2" ;;
         esac
         ;;
     button/sleep)
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index f8ed34036..6ab97891b 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120022 2011-04-18 12:49:11Z ibiru $
+# $Id: PKGBUILD 125884 2011-05-31 13:01:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=consolekit
-pkgver=0.4.4
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
         pam-foreground-compat.ck consolekit.logrotate)
-md5sums=('b57eb18eae8c4d3631d5f4f030218a29'
+md5sums=('f2657f93761206922d558471a936fbc3'
          'a8a4de71d9b0549b8143e5f6c2a36fc7'
          '6fefa451d9fe2fc6d6269629d3529793')
 
@@ -24,6 +24,7 @@ build() {
       --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/ConsoleKit \
+      --with-systemdsystemunitdir=/lib/systemd/system \
       --enable-pam-module \
       --enable-docbook-docs
   make
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index eae2d4777..17488c5a5 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 104366 2011-01-01 20:04:19Z ibiru $
+# $Id: PKGBUILD 125874 2011-05-31 09:04:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=f-spot
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal photo management program for GNOME"
 url="http://www.gnome.org/projects/f-spot/"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('mono-addins>=0.3' 'gnome-sharp>=2.8' 'ndesk-dbus-glib>=0.3.0' 'lcms>=1.12' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool>=0.35.0' 'gnome-doc-utils>=0.17.3' 'gnome-screensaver>=2.30.0')
+depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index a5768c9ec..ac5e5f98f 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $
+# $Id: PKGBUILD 125903 2011-05-31 16:34:54Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
-pkgver=3.0.2
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
@@ -15,13 +15,13 @@ makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
 conflicts=('fast-user-switch-applet')
 replaces=('fast-user-switch-applet')
 install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         2.91_fix_external_program_directories.patch
         gdm-vt-allocation-hack.patch
         gdm.pam
         gdm-autologin.pam
         gdm)
-sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05'
+sha256sums=('7d2947fbc96c43cc94fd5915882655820c5453a1b1b11643b3c1be361f4288fd'
             '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index abd545ac3..42dbb79ea 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $
+# $Id: PKGBUILD 125897 2011-05-31 15:23:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.0.3
-pkgrel=2
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,8 +13,8 @@ groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('0398dcc4021bf620b52ed82994fee3011ccbb012aa939ce688a2d185a68e8d6d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index ea7f76aaa..fa560e23b 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 123759 2011-05-12 21:02:36Z andrea $
+# $Id: PKGBUILD 125923 2011-05-31 21:45:14Z andrea $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Perfect hash function generator"
 arch=('x86_64' 'i686')
 url="http://www.gnu.org/software/gperf/"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
 install=gperf.install
-source=("ftp://ftp.gnu.org/gnu/gperf/${pkgname}-${pkgver}.tar.gz")
+source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c1f1db32fb6598d6a93e6e88796a8632')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --docdir=/usr/share/gperf/doc/
   make
 }
 
diff --git a/extra/gperf/gperf.install b/extra/gperf/gperf.install
index 1c20e2f5c..cdb8f9de8 100644
--- a/extra/gperf/gperf.install
+++ b/extra/gperf/gperf.install
@@ -1,11 +1,9 @@
 infodir=/usr/share/info
-filelist=(gperf.info.gz)
+file=gperf.info.gz
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
+  install-info $infodir/$file $infodir/dir 2> /dev/null
 }
 
 post_upgrade() {
@@ -14,7 +12,5 @@ post_upgrade() {
 
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
+  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
 }
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index a0628a309..e4398d745 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=git20110524
-_commit=f112886575a9c1fc8986f098db9ef84a6fb2e98e
+pkgver=git20110531
+_commit=997e26d85cb76de9adb18f7ee8894556e3fa2653
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('19d139aa4e80b5829b8a898b315a0a0a')
+md5sums=('0ac02acfc3e045c3a584301e3bc05994')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 09050b137..0cbf5438b 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110397 2011-02-19 07:14:33Z eric $
+# $Id: PKGBUILD 125918 2011-05-31 21:19:50Z andrea $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -7,15 +7,14 @@
 pkgbase=ruby
 pkgname=('ruby' 'ruby-docs')
 pkgver=1.9.2_p180
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
-makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk' 'libffi' 'doxygen'
-        'graphviz')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz')
 options=('!emptydirs')
-source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
+source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
 md5sums=('68510eeb7511c403b91fe5476f250538')
 sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5')
 
@@ -30,9 +29,9 @@ build() {
 }
 
 package_ruby() {
-  depends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'libffi')
+  depends=('openssl' 'libffi')
   provides=('rubygems' 'rake')
-  conflicts=('rubygems' 'rake')
+  conflicts=('rake')
   optdepends=('tk: for Ruby/TK')
 
   cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
@@ -46,5 +45,5 @@ package_ruby-docs() {
 
   cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
   make -j1 DESTDIR="${pkgdir}" install-doc install-capi
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index bec4664f4..0ca1a910e 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,33 +1,20 @@
-# $Id: PKGBUILD 118854 2011-04-08 16:01:46Z stephane $
+# $Id: PKGBUILD 125892 2011-05-31 15:18:06Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
 url="http://www.swig.org/"
 license=('custom')
-depends=('gcc-libs' 'zlib' 'pcre')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        swig-deprecated-pycobject.patch
-        swig-pyslice.patch)
-sha1sums=('da09610f0b925fae40b40186d262c46e3e1f2bf0'
-          'add71330c5d839d9a27b1ca688e6c5e31f1edb7b'
-          'b8e28148fcef01f24a9acc6218dc090dbde03c37')
+depends=('zlib' 'pcre')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('ace563563a8f6f367ba82236e5bea240adea0d94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Use PyCapsule API instead of deprecated PyCObject API in python bindings
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=623854
-  patch -Np1 -i ../swig-deprecated-pycobject.patch
-
-  # Fix PySlice* API/ABI issues with the Python 3.2
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=666429
-  patch -Np1 -i ../swig-pyslice.patch
-
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index f5cb3da4a..c977e58c5 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 115274 2011-03-17 16:40:45Z andyrtr $
+# $Id: PKGBUILD 125879 2011-05-31 11:40:47Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-_gitdate=20110316
+_gitdate=20110531
 pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=2
+pkgrel=1
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/"
@@ -14,10 +14,10 @@ depends=('libdrm' 'udev')
 optdepends=('nouveau-dri:	experimental gallium3d features')
 makedepends=('xorg-server-devel' 'libdrm>=2.4.24' 'xf86driproto')
 conflicts=('xorg-server<1.10.0')
-options=('!libtool') # 'force')
+options=('!libtool')
 install=${pkgname}.install
 source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('0ab7a1c9d3ec5dd020c09212a58ca801')
+md5sums=('37e6e9d79ed6e658066cb2e80caaeef9')
 
 # source PKGBUILD && mksource
 mksource() {