Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 22 insertions, 24 deletions

diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 6d066765a..644b3b6ab 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 170844 2012-11-12 15:18:06Z heftig $
+# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.2
-pkgrel=1.1
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=3.8.1
+pkgrel=1
+arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
+license=(LGPL)
+makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad')
+sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb')
+
+prepare() {
+  mkdir build-py2 build-py3 devel
+  cd ${pkgbase}-${pkgver}
+  sed -i '/Werror=format/d' configure # gcc 4.8
+}
 
 build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
+  cd build-py2
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2
+  make
+
+  cd ../build-py3
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr
+  make
 }
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
   depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
 
-  cd "$pkgbase-$pkgver"
+  cd build-py3
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
 }
@@ -44,7 +42,7 @@ package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
   depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
 
-  cd "python2-build"
+  cd build-py2
   make DESTDIR="$pkgdir" install
   mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
 }