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

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

2 files changed, 21 insertions, 30 deletions

diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index e1fc1d130..3e09aad25 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 104220 2010-12-30 21:23:10Z ibiru $
-# Mantainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=2.32.1.1
+pkgver=3.0.1.0
 pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment (IDE)"
+pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libunique>=1.1.6' 'gconf>=2.32.0' 'vte>=0.26.2' 'gdl>=2.30.1' 'autogen>=5.9.9' 'devhelp>=2.32.0' 'gtksourceview2>=2.10.5' 'glade>=3.6.7' 'libgda>=4.2.1' 'subversion>=1.6.9' 'gnome-icon-theme>=2.31.0' 'hicolor-icon-theme' 'vala>=0.10.1' 'graphviz>=2.6.23' 'perl-locale-gettext')
-makedepends=('gnome-doc-utils>=0.20.2' 'intltool')
+depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda'
+         'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz'
+         'python2' 'shared-mime-info' 'desktop-file-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 url="http://anjuta.sourceforge.net/"
 install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
-sha256sums=('f2b67609890a45d907ab5b42fd5963ba7cb41193d4a0dd2543584eca2ec5db58')
+sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261')
 
 build() {
   cd "${srcdir}/anjuta-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make
 }
@@ -26,12 +28,8 @@ build() {
 package(){
   cd "${srcdir}/anjuta-${pkgver}"
 
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
+  sed -i "1s|#!/usr/bin/python$|&2|" \
     $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain anjuta ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install
index 98f44a08f..c6fcfec11 100644
--- a/extra/anjuta/anjuta.install
+++ b/extra/anjuta/anjuta.install
@@ -1,28 +1,21 @@
-pkgname=anjuta
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-mime-database usr/share/mime > /dev/null
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall anjuta
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-mime-database usr/share/mime > /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
+  post_install
 }