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

Conflicts:
	community/linux-tools/PKGBUILD
	community/powertop/PKGBUILD

1 files changed, 11 insertions, 6 deletions

diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 2cf1623d5..e84aada0f 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69338 2012-04-14 09:48:38Z jconder $
+# $Id: PKGBUILD 75406 2012-08-22 08:09:42Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
-pkgver=0.6.22
-pkgrel=1
+pkgver=0.7.6
+pkgrel=2
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
@@ -12,8 +12,10 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
              'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
-source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz")
-sha256sums=('b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d')
+source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
+        'adopt.patch')
+sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
+            'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
@@ -22,6 +24,8 @@ build() {
   sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in'
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
 
+  patch -Np1 -i "$srcdir/adopt.patch"
+
   export PYTHON=/usr/bin/python2
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
@@ -61,7 +65,7 @@ package_packagekit() {
   rm -rf "$pkgdir/usr/include/PackageKit/packagekit-qt"*
   rm -rf "$pkgdir/usr/lib/libpackagekit-qt"*
   rm -rf "$pkgdir/usr/lib/pkgconfig/packagekit-qt"*
-  rm -rf "$pkgdir/usr/share/cmake"
+  rm -rf "$pkgdir/usr/lib/cmake"
 
   rm -rf "$pkgdir/usr/lib/python"*
   rm -rf "$pkgdir/usr/share/PackageKit/website"
@@ -69,6 +73,7 @@ package_packagekit() {
   mkdir -p "$pkgdir/usr/share/bash-completion/completions"
   mv "$pkgdir/etc/bash_completion.d/pk-completion.bash" \
      "$pkgdir/usr/share/bash-completion/completions/pkcon"
+  rmdir "$pkgdir/etc/bash_completion.d"
   touch "$pkgdir/var/log/PackageKit"
 }