5 files changed, 74 insertions, 31 deletions
diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD
index 25fb2293c..3096757a3 100644
--- a/gnome-unstable/gtkmm3/PKGBUILD
+++ b/gnome-unstable/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137184 2011-09-06 10:50:37Z ibiru $
+# $Id: PKGBUILD 138095 2011-09-16 08:53:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.1.18
+pkgver=3.1.90
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.1/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('71ea98e5d8dceb1347424120e4e4b08aaabf77ddff4de6ab07977bd9fa5e9251')
+sha256sums=('db54fad0a60d6463323f538837a213ad1838b0b7197d07359f268205b63685f9')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/gnome-unstable/pavucontrol/PKGBUILD b/gnome-unstable/pavucontrol/PKGBUILD
new file mode 100644
index 000000000..cd12238db
--- /dev/null
+++ b/gnome-unstable/pavucontrol/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 138100 2011-09-16 09:17:47Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=pavucontrol
+pkgver=0.99.2
+pkgrel=1
+pkgdesc="A GTK volume control tool for PulseAudio"
+arch=(i686 x86_64)
+url="http://0pointer.de/lennart/projects/pavucontrol"
+license=(GPL)
+depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
+makedepends=(intltool lynx)
+source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.gz
+        pavucontrol.desktop)
+sha256sums=('4a95065a4afb2a18142b60d6f0950171198372650391275dcdcd4671ba763cdf'
+            '5eab8c78e92c39a71ac1ca4c4464a8915d3a29d91e1703fd51c24652b747eebe')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --enable-gtk3
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/pavucontrol.desktop" \
+    "$pkgdir/usr/share/applications/pavucontrol.desktop"
+}
diff --git a/gnome-unstable/pavucontrol/pavucontrol.desktop b/gnome-unstable/pavucontrol/pavucontrol.desktop
new file mode 100644
index 000000000..842dc96b6
--- /dev/null
+++ b/gnome-unstable/pavucontrol/pavucontrol.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=PulseAudio Volume Control
+GenericName=Volume Control
+Comment=Adjust the volume level
+Exec=pavucontrol
+Icon=multimedia-volume-control
+StartupNotify=true
+Type=Application
+Categories=AudioVideo;Audio;
+GenericName[en_GB]=Volume Control
diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD
index 19317b013..793fa97ec 100644
--- a/gnome-unstable/pygobject/PKGBUILD
+++ b/gnome-unstable/pygobject/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 136917 2011-09-02 19:06:48Z ibiru $
+# $Id: PKGBUILD 138090 2011-09-16 08:43:47Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
-pkgname=(python-gobject python2-gobject)
-pkgver=2.90.3
-pkgrel=3
+pkgname=(python-gobject python2-gobject pygobject-devel)
+pkgver=2.90.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
-depends=('glib2' 'gobject-introspection')
+depends=('glib2' 'gobject-introspection' )
 makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
-        documentation-location.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 options=('!libtool')
-sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4'
-            '6174cdeea99e134168ef8235251d9c3802200ee75dc63f86144de75f864e1344')
+sha256sums=('8407b6997181bbca4783798e21d7d63ca41708a6c05a3b08c953d64e7b97b2a1')
 
 build() {
   cd "${srcdir}"
   cp -a "${pkgbase}-${pkgver}" python2-build
+  mkdir devel
 
   (
     cd python2-build
-    patch -Np1 -i ${srcdir}/documentation-location.patch
-    autoreconf -fi
     export PYTHON=/usr/bin/python2
     ./configure --prefix=/usr
     make
@@ -31,8 +28,6 @@ build() {
 
   (
     cd "${pkgbase}-${pkgver}"
-    patch -Np1 -i ${srcdir}/documentation-location.patch
-    autoreconf -fi
     ./configure --prefix=/usr
     make
   )
@@ -40,19 +35,26 @@ build() {
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo')
+  depends+=('python' 'python-cairo' "pygobject-devel=${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/python3.2/site-packages/gtk-2.0/"
+  rm -r "${pkgdir}"/usr/{include,lib/pkgconfig}
 }
 
 package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo')
-  conflicts=('python-gobject')
+  depends+=('python2' 'python2-cairo' "pygobject-devel=${pkgver}")
 
   cd "${srcdir}/python2-build"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/python2.7/site-packages/gtk-2.0/"
+  mv "${pkgdir}"/usr/{include,lib/pkgconfig} "${srcdir}/devel"
+}
+
+package_pygobject-devel() {
+  pkgdesc="Development files for the pygobject bindings"
+  cd "${srcdir}/devel"
+  mkdir -p "${pkgdir}"/usr/{include,lib}
+  mv include "${pkgdir}/usr/"
+  mv pkgconfig "${pkgdir}/usr/lib/"
 }
diff --git a/gnome-unstable/pygobject2/PKGBUILD b/gnome-unstable/pygobject2/PKGBUILD
index 5aef1bcb4..e3eba387e 100644
--- a/gnome-unstable/pygobject2/PKGBUILD
+++ b/gnome-unstable/pygobject2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 136913 2011-09-02 18:43:01Z ibiru $
+# $Id: PKGBUILD 138099 2011-09-16 09:12:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/"
 license=('LGPL')
 depends=('glib2' 'pygobject2-devel')
-makedepends=(python python2 'namcap')
+makedepends=('python' 'python2')
 source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
         python3-fix-build.patch
         python3-fix-maketrans.patch)
@@ -43,6 +43,7 @@ build() {
 
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
+  depends+=('python')
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
@@ -55,6 +56,7 @@ package_python-gobject2() {
 
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
+  depends+=('python2')
   replaces=('pygobject')
   provides=("pygobject=$pkgver")
 
@@ -65,23 +67,18 @@ package_python2-gobject2() {
     xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # Split devel stuff
-  mv "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \
+  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
     "$srcdir/devel/"
 }
 
 package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
-  depends=('python2')
-  replaces=('pygobject-devel')
-  provides=('pygobject-devel')
 
   cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}
+  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
 
-  mv bin       "$pkgdir/usr/"
   mv include   "$pkgdir/usr/"
   mv pkgconfig "$pkgdir/usr/lib/"
   mv gtk-doc   "$pkgdir/usr/share/"
-  mv codegen   "$pkgdir/usr/share/pygobject/2.0/"
   mv xsl       "$pkgdir/usr/share/pygobject/"
 }