Sun Jun 17 00:03:04 UTC 2012

11 files changed, 62 insertions, 64 deletions

diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 8e759763b..a0aef9507 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146699 2012-01-16 19:33:36Z ibiru $
+# $Id: PKGBUILD 161868 2012-06-16 00:18:47Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Martin Kemp <mdkemp@elys.com>
 
 pkgname=ethtool
-pkgver=3.2
+pkgver=3.4
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
@@ -13,15 +13,15 @@ url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
 source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('4ed4a9dfd2039aa416176a9c06497b00')
+md5sums=('cc4c4cf3ac086a53cd24f17d426f2b8f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
+    cd $pkgname-$pkgver
+    ./configure --prefix=/usr --mandir=/usr/share/man
+    make
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     make DESTDIR="$pkgdir" install
 }
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 849c87353..6ca6455ff 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155391 2012-04-03 10:23:46Z jgc $
+# $Id: PKGBUILD 161854 2012-06-15 16:53:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.9
-pkgrel=2
+pkgver=2.4.10
+pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,24 +12,16 @@ depends=('zlib' 'bzip2' 'sh')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch
-        bug35833.patch
-        bug35847.patch)
-md5sums=('77a893dae81fd5b896632715ca041179'
+        freetype-2.2.1-enable-valid.patch)
+md5sums=('13286702e9390a91661f980608adaff1'
          '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680'
-         '69bde731a06448c7e4828e96c74d45ee'
-         '41f9c0a5362bf2cd9a4d7557ddf98098')
+         '214119610444c9b02766ccee5e220680')
 
 build() {
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
 
-  #Upstream bugs fixed in git. Requested in FS#29034
-  patch -Np1 -i "${srcdir}/bug35833.patch"
-  patch -Np1 -i "${srcdir}/bug35847.patch"
-
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index f3fbe98e7..ff2b03ab7 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156796 2012-04-23 09:05:49Z ibiru $
+# $Id: PKGBUILD 161847 2012-06-15 14:38:32Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.9
+pkgver=2.6.10
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ebb60a35fa5c0789fe10f6e4af5040cb7bc4a707a8a962fbd57b4fc5595c0b9')
+sha256sums=('a0e1132613339d6ba06df483a1f8d8bda6feb4f58f8b102daab2f1390fd6a3b7')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 1a5e1c4fa..9a0979599 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158129 2012-05-03 13:11:10Z heftig $
+# $Id: PKGBUILD 161844 2012-06-15 14:35:56Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('97a229e81997c14064899bdec2a62f94738d00d2f88cc18bcbeb2bdf0610e272'
+sha256sums=('179f55fc5933eaca657cdda0d95c6e782b80cf210b1552720aa6d83d31a8c21a'
             'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
 
 build() {
diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD
index 55f0d3237..81f20b214 100644
--- a/extra/libva-driver-intel/PKGBUILD
+++ b/extra/libva-driver-intel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157792 2012-04-29 15:12:31Z ibiru $
+# $Id: PKGBUILD 161867 2012-06-16 00:18:43Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-driver-intel
-pkgver=1.0.17
+pkgver=1.0.18
 pkgrel=1
 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('MIT')
 depends=('libva')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('3421dcaed1df346b9070b85ec8b238cd')
+md5sums=('d8c52f07148dfb2e0407549b90300bc1')
 
 build() {
   cd intel-driver-$pkgver
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 33d8d6bc6..9317458cc 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 141737 2011-11-02 16:40:27Z ibiru $
+# $Id: PKGBUILD 161866 2012-06-16 00:18:39Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
-pkgver=1.0.15
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
-depends=('libgl' 'libdrm' 'libxfixes')
+depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
 makedepends=('mesa')
 optdepends=('vdpau-video: vdpau back-end for nvidia'
             'libva-driver-intel: back-end for intel cards')
 options=('!libtool')
 install=libva.install
 source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ad8a94ba87ff0563a533c3c142816794')
+md5sums=('b22179bd44137e91d5c77a43a0cb8063')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
   ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index db2ac75ab..d27cd5ed8 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 157952 2012-04-30 07:19:08Z tpowa $
+# $Id: PKGBUILD 161828 2012-06-15 08:18:10Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=16
+pkgrel=18
 epoch=1
-_extramodules=extramodules-3.3-ARCH
+_extramodules=extramodules-3.4-ARCH
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.3' 'linux-headers<3.4' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -62,7 +62,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.3' 'linux<3.4')
+  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 4339aaf45..4551e88dc 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.3-ARCH
+EXTRAMODULES=extramodules-3.4-ARCH
 
 post_install() {
   # updating module dependencies
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 94b238613..1a7a4ec41 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161809 2012-06-14 18:56:19Z heftig $
+# $Id: PKGBUILD 161859 2012-06-15 19:32:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -8,15 +8,14 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.4.0
-pkgrel=5
-_snapshot=83760a7
+pkgrel=6
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
          'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -26,21 +25,25 @@ optdepends=('modemmanager: for modem management service'
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-#source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-$_snapshot.tar.xz
-         NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
-sha256sums=('6cb6d6c87306a7cd4aeed786c3445677b6df4e56ddcc4a6c1747c09c44114091'
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
+         initialize-GError.patch dont-fight-over-ipv6.patch)
+sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
+            '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6'
+            'cc66f2fdf59f4f9873a5b775421e1968861c5541d7e29b83b4d30351ad1f9e94')
 
 build() {
-  cd $_pkgname-$_snapshot
+  cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
+  patch -Np1 -i ../initialize-GError.patch
+  patch -Np1 -i ../dont-fight-over-ipv6.patch
 
-  ./autogen.sh \
+  ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -62,10 +65,13 @@ build() {
 }
 
 package() {
-  cd $_pkgname-$_snapshot
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
 
   rm -r "$pkgdir/var/run"
+
+  # Provide native service for arch-daemons generator
+  ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service"
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 2796f3f38..d6c4bfb03 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160455 2012-06-02 08:38:48Z pierre $
+# $Id: PKGBUILD 161823 2012-06-15 06:04:39Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,8 +21,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.3
-pkgrel=4
+pkgver=5.4.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('51f9488bf8682399b802c48656315cac'
+md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'aabda9f3f2f8b9d8fdc9558c31c718db'
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index b8a555720..d1658694a 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157993 2012-04-30 18:25:04Z stephane $
+# $Id: PKGBUILD 161852 2012-06-15 16:11:26Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.6
+pkgver=2.0.7
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8e27a735d1f53be2e3d8d8473a3847e89ba89da8')
+sha1sums=('307020fb6437092e32c9c1bd9af8bccb1645b529')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"