Merge branch 'master' of https://github.com/X-dark/ArchLinux

Conflicts:
	pkgbuild/thunderbird-nightly/PKGBUILD

pkgbuild/cairo-compmgr/PKGBUILD

@@ -10,14 +10,14 @@
 pkgname=cairo-compmgr
 pkgver=git20111002
 _commit=348f149af30bc829c2100d0e622c5dcaf43925b7
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="A Cairo based composite manager"
 arch=(i686 x86_64)
 url="http://cairo-compmgr.tuxfamily.org/"
 license=(LGPL)
 makedepends=(gettext gtk-doc "intltool>=0.41" git)
-depends=("gtk2>=2.16.0" "vala>=0.14" libsm gconf)
+depends=("gtk2>=2.16.0" "vala>=0.16" libsm gconf)
 install=cairo-compmgr.install
 options=(!libtool)
 #source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz)
@@ -49,8 +49,8 @@ build() {
   cd "$srcdir/$__gitname-build"
   git checkout "$_commit"
 
-#  sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac
-  ./autogen.sh --prefix=/usr LIBS=-ldl
+  sed -i 's!libvala-0.14!libvala-0.16!' vapi/cairo-compmgr.deps configure.ac
+  ./autogen.sh --prefix=/usr LIBS="-ldl -lgmodule-2.0"
   make -j1
 }
 

pkgbuild/libcec-git/PKGBUILD

@@ -1,14 +1,14 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 
 pkgname=libcec-git
-pkgver=20120126
+pkgver=20120515
 pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64')
 url="https://github.com/Pulse-Eight/libcec"
 license=('GPL')
 makedepends=('git')
-depends=('udev>=151')
+depends=('udev>=151' 'lockdev')
 provides=('libcec')
 conflicts=('libcec')
 options=('!libtool')

pkgbuild/thunderbird-nightly/PKGBUILD

@@ -3,8 +3,8 @@
 # Based on [extra]'s thunderbird
 
 pkgname=thunderbird-nightly
-pkgver=15.0a1
-pkgrel=2
+pkgver=16.0a1
+pkgrel=1
 pkgdesc="Standalone Mail/News reader - Nightly build"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')

pkgbuild/unarchiver/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: N30N <archlinux@alunamation.com>
 
 pkgname=unarchiver
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686')
@@ -13,7 +13,7 @@ makedepends=('gcc-objc')
 source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip"
         "native_obj_exceptions.patch"
         "libz.patch")
-sha1sums=('a8a28e3372a8811689c39871f5de86c64c8c466c'
+sha1sums=('8ab30c79e653ed27b4f9e5f5ae649cbc7b18701a'
           'b8024026607dc2de758479b73d8b01ca6f692b59'
           '003d114a0ba9a919af602881ef5e04cdba2e4c50')