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

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

9 files changed, 91 insertions, 33 deletions

diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 430bea35c..00f64c431 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74017 2012-07-18 01:51:17Z jconder $
+# $Id: PKGBUILD 75404 2012-08-22 06:01:57Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.packagekit.org/'
diff --git a/community/libbsd/PKGBUILD b/community/libbsd/PKGBUILD
index 14d814cd5..60a62913c 100644
--- a/community/libbsd/PKGBUILD
+++ b/community/libbsd/PKGBUILD
@@ -1,30 +1,30 @@
+# $Id: PKGBUILD 75426 2012-08-23 01:07:04Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libbsd
-pkgver=0.3.0
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libbsd.freedesktop.org"
 license=('custom')
 depends=('glibc')
-source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
-        LICENSE)
-md5sums=('833e58531b4bd84b119b53d834d8e0d8'
-         '5bd59ff83a7df4873b034478ffae62a6')
+source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('591fc9de4ca22f78cf87a94e648a92f4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  make exec_prefix=/usr includedir=/usr/include/libbsd
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  make exec_prefix=/usr includedir=/usr/include/libbsd DESTDIR=$pkgdir install
-  install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make DESTDIR=$pkgdir install
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/linux-tools/cpupower.pmutils b/community/linux-tools/cpupower.pmutils
new file mode 100644
index 000000000..fb93cd7c1
--- /dev/null
+++ b/community/linux-tools/cpupower.pmutils
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+[[ -x /usr/bin/cpupower ]] || exit $NA
+
+CPUPOWER_GOVERNOR_AC=${CPUPOWER_GOVERNOR_AC:-ondemand}
+CPUPOWER_GOVERNOR_BAT=${CPUPOWER_GOVERNOR_BAT:-conservative}
+
+help() {
+    cat <<EOF
+--------
+$0: Select cpupower frequency governor.
+
+Parameters:
+CPUPOWER_GOVERNOR_AC = Governor to use on AC.
+Defaults to ondemand.
+
+CPUPOWER_GOVERNOR_BAT = Governor to use on battery.
+Defaults to conservative.
+
+EOF
+}
+
+cpupow() {
+  printf 'Setting cpupower frequency governor to %s...' "$1"
+  cpupower -c all frequency-set -g "$1"
+}
+
+case $1 in
+  true) cpupow "$CPUPOWER_GOVERNOR_BAT" ;;
+  false) cpupow "$CPUPOWER_GOVERNOR_AC" ;;
+  help) help;;
+  *) exit $NA ;;
+esac
+
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
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"
 }
 
diff --git a/community/packagekit/adopt.patch b/community/packagekit/adopt.patch
new file mode 100644
index 000000000..5eaf0ea8b
--- /dev/null
+++ b/community/packagekit/adopt.patch
@@ -0,0 +1,13 @@
+diff -ru a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
+--- a/lib/packagekit-glib2/pk-client.c	2012-08-22 00:30:33.000000000 +1200
++++ b/lib/packagekit-glib2/pk-client.c	2012-08-22 19:58:44.772432269 +1200
+@@ -4898,9 +4898,6 @@
+ 
+ 	/* connect */
+ 	pk_client_proxy_connect (state);
+-
+-	state->ret = TRUE;
+-	pk_client_state_finish (state, NULL);
+ }
+ 
+ /**
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 9df9b58d9..bf0af6acd 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 70596 2012-05-12 11:08:44Z jlichtblau $
+# $Id: PKGBUILD 75422 2012-08-22 21:05:18Z seblu $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
-pkgdesc="A tool to diagnose issues with power consumption and power management"
+pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://01.org/powertop/"
+url='https://01.org/powertop/'
 license=('GPL2')
-depends=('libnl' 'ncurses')
+depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
 changelog=$pkgname.changelog
-source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c')
+source=("https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz")
+sha256sums=('3dd4816cca4167063b78d2d7772aff8dc58377d0ed74bf11862412a8a80d2698')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr 
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog
index 7e8deb15d..581da010b 100644
--- a/community/powertop/powertop.changelog
+++ b/community/powertop/powertop.changelog
@@ -1,2 +1,5 @@
+2012-08-22 Sébastien Luttringer (seblu) <seblu@aur.archlinux.org>
+	* powertop 2.1-1
+
 2012-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* powertop 2.0-1
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index c49c1ebff..079899c3d 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72729 2012-06-21 16:19:43Z ttopper $
+# $Id: PKGBUILD 75419 2012-08-22 19:34:43Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=1.1.0.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification')
 replaces=('dissonance')
 install=pragha.install
 source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2")
-sha1sums=('2db115a7f263ea8bcac446590ccc32cae7542c93')
+sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD
index 07d5eb3ba..605259077 100644
--- a/community/rygel/PKGBUILD
+++ b/community/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75009 2012-08-11 13:57:55Z bgyorgy $
+# $Id: PKGBUILD 75414 2012-08-22 16:11:51Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
 pkgver=0.14.3
-pkgrel=1
+pkgrel=2
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Rygel"
@@ -25,7 +25,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
+              --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin
   make
 }