Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/gnash/PKGBUILD
	community/libopenraw/PKGBUILD
	community/smalltalk/PKGBUILD
	core/coreutils/PKGBUILD
	core/libarchive/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/lirc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/sdl_net/PKGBUILD
	extra/sdl_ttf/PKGBUILD
	extra/spamassassin/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/tumbler/PKGBUILD
	extra/vim/PKGBUILD
	extra/wipe/PKGBUILD
	extra/xfce4-netload-plugin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	multilib/binutils-multilib/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/dev86/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-glibc/lib32-glibc.conf
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/lib32-sdl_ttf/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD
	multilib/q4wine/PKGBUILD
	multilib/wine/PKGBUILD
	staging/php/PKGBUILD
	staging/php/php-fpm.conf.in.patch
	staging/php/php.ini.patch

1 files changed, 10 insertions, 7 deletions

diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 4f7436675..95957f648 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 56266 2011-10-04 10:14:17Z jconder $
+# $Id: PKGBUILD 62160 2012-01-17 00:26:49Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.19
+pkgver=0.6.21
 pkgrel=1
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,20 +12,23 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
 	     'shared-mime-info' 'sqlite3' 'udev')
 options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz")
-sha256sums=('961c6408de08ebaf15c09e74afd06918d699be8974b5c35c2c9663e5b12b5223')
+source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
+        'alpm.patch')
+sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e'
+            'fbe54a89c3495376a0b939b67fec5b2e57bed46e92b3f4816d797745882481e6')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
 
-  # TODO: remove when this is fixed upstream
-  find -name '*.moc' -print0 | xargs -0 rm
+  patch -Np1 -i "$srcdir/alpm.patch"
 
   sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
   sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
 
   export PYTHON=/usr/bin/python2
+  # TODO: remove when upstream is patched
+  autoreconf
   ./configure --prefix=/usr \
 	      --sysconfdir=/etc \
 	      --localstatedir=/var \
@@ -51,7 +54,7 @@ package_packagekit() {
   backup=('var/lib/PackageKit/transactions.db'
           'etc/PackageKit/alpm.d/pacman.conf'
           'etc/PackageKit/alpm.d/repos.list')
-  depends=('dbus-glib' 'pacman>=3.5.0' 'pacman<3.6.0' 'polkit'
+  depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
            'shared-mime-info' 'sqlite3' 'udev')
   optdepends=('networkmanager')
   install='packagekit.install'