From 25e39d3ad6f66fad48c0183dd568e2fbfded5ca2 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 2 May 2009 01:55:02 -0700
Subject: Latest version or newly required deps for various packages.

---
 abs/core-testing/gcc/PKGBUILD                      |  19 +-
 abs/core-testing/intltool/ChangeLog                |   9 +
 abs/core-testing/intltool/PKGBUILD                 |   9 +-
 abs/core-testing/libglade/PKGBUILD                 |  18 +-
 abs/core-testing/smbclient/PKGBUILD                |  14 +-
 abs/extra-testing/apache-ant/PKGBUILD              |  41 +++
 .../gconf/01_xml-gettext-domain.patch              | 299 +++++++++++++++++
 .../05_from_vuntz_gconf2-pk-default-path.patch     |  12 +
 abs/extra-testing/gconf/PKGBUILD                   |  30 +-
 abs/extra-testing/gconf/gconf-merge-schema         |  22 +-
 abs/extra-testing/gconf/gconf.install              |  15 +-
 abs/extra-testing/gconf/xml-gettext-domain.patch   | 367 +++++++++++++++++++++
 abs/extra-testing/gnome-vfs/PKGBUILD               |  22 +-
 abs/extra-testing/gnome-vfs/gnome-vfs.install      |   5 -
 abs/extra-testing/libbonobo/PKGBUILD               |  16 +-
 abs/extra-testing/libbonoboui/PKGBUILD             |  12 +-
 abs/extra-testing/libgda/PKGBUILD                  |  24 ++
 abs/extra-testing/libgda/bdb43.patch               |  18 +
 abs/extra-testing/libgda/libgda.install            |  16 +
 abs/extra-testing/libgnome/PKGBUILD                |  24 +-
 abs/extra-testing/libgnome/libgnome.install        |   5 -
 abs/extra-testing/libgnomecanvas/PKGBUILD          |  14 +-
 abs/extra-testing/libgnomekbd/PKGBUILD             |  12 +-
 abs/extra-testing/libgnomeui/PKGBUILD              |  14 +-
 abs/extra-testing/libgtop/PKGBUILD                 |  10 +-
 abs/extra-testing/libidl2/PKGBUILD                 |  16 +-
 abs/extra-testing/libxp/PKGBUILD                   |  24 ++
 abs/extra-testing/openjdk6/PKGBUILD                | 155 +++++++++
 abs/extra-testing/openjdk6/aatext_by_default.diff  |  35 ++
 .../openjdk6/fix_corba_cmds_path.diff              |  33 ++
 abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff  |  33 ++
 abs/extra-testing/openjdk6/fontconfig-paths.diff   |  43 +++
 .../openjdk6/gcjwebplugin_xulrunner.diff           |  11 +
 abs/extra-testing/openjdk6/openjdk6.install        |  12 +
 abs/extra-testing/openjdk6/openjdk6.profile        |   4 +
 abs/extra-testing/orbit2/PKGBUILD                  |  10 +-
 abs/extra-testing/printproto/PKGBUILD              |  22 ++
 abs/extra-testing/rhino/PKGBUILD                   |  18 +
 abs/extra-testing/xalan-java/PKGBUILD              |  21 ++
 abs/extra-testing/xerces2-java/PKGBUILD            |  22 ++
 40 files changed, 1363 insertions(+), 143 deletions(-)
 create mode 100644 abs/extra-testing/apache-ant/PKGBUILD
 create mode 100644 abs/extra-testing/gconf/01_xml-gettext-domain.patch
 create mode 100644 abs/extra-testing/gconf/05_from_vuntz_gconf2-pk-default-path.patch
 create mode 100644 abs/extra-testing/gconf/xml-gettext-domain.patch
 create mode 100644 abs/extra-testing/libgda/PKGBUILD
 create mode 100644 abs/extra-testing/libgda/bdb43.patch
 create mode 100644 abs/extra-testing/libgda/libgda.install
 create mode 100644 abs/extra-testing/libxp/PKGBUILD
 create mode 100644 abs/extra-testing/openjdk6/PKGBUILD
 create mode 100644 abs/extra-testing/openjdk6/aatext_by_default.diff
 create mode 100644 abs/extra-testing/openjdk6/fix_corba_cmds_path.diff
 create mode 100644 abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff
 create mode 100644 abs/extra-testing/openjdk6/fontconfig-paths.diff
 create mode 100644 abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff
 create mode 100644 abs/extra-testing/openjdk6/openjdk6.install
 create mode 100644 abs/extra-testing/openjdk6/openjdk6.profile
 create mode 100644 abs/extra-testing/printproto/PKGBUILD
 create mode 100644 abs/extra-testing/rhino/PKGBUILD
 create mode 100644 abs/extra-testing/xalan-java/PKGBUILD
 create mode 100644 abs/extra-testing/xerces2-java/PKGBUILD

diff --git a/abs/core-testing/gcc/PKGBUILD b/abs/core-testing/gcc/PKGBUILD
index f0d6b7e..fd796b4 100644
--- a/abs/core-testing/gcc/PKGBUILD
+++ b/abs/core-testing/gcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 19322 2008-11-20 11:36:53Z andyrtr $
+# $Id: PKGBUILD 25249 2009-01-24 18:28:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gcc
-pkgver=4.3.2
-pkgrel=2
+pkgver=4.3.3
+pkgrel=1
 #_snapshot=4.3-20080724
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
@@ -21,17 +21,15 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,o
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-20080118.tar.bz2
 	gcc_pure64.patch
 	gcc-hash-style-both.patch
-	gcc-java-driver.patch
 	buildfix_new_bison.patch)
-md5sums=('dd8048b43d3d4e5595bcade47b9144c6'
-         'bfdf8d19e1b85f522f8b8d48d25e7aaa'
-         'b3294ae213d65e05aacb9b46d11e1025'
-         '08efa42ef267f8759146aa4e11904d25'
-         '4a1dee5782dccc505072c6401cf1d4c3'
+md5sums=('1739288c2c7b1472796b33d641dbdbbd'
+         '18428e313a9927d38b313e688c62219b'
+         '8771e6190dd4f3178b2a7978d2380a5d'
+         '125b75947c763ba59b7ea95d3739d431'
+         '068938366ee0be5b70112bdf485898b4'
          '990881456a89b1ffbd68d2d7188759da'
          '4030ee1c08dd1e843c0225b772360e76'
          'bb420bc84b1104455b7230b1cd4b96c2'
-         'c82665e579850eb37cdee8349d614dbe'
          '412fb8ebb30958eb1a93e9bd89413dd7')
 
 build() {
@@ -49,7 +47,6 @@ build() {
     patch -Np1 -i ../gcc_pure64.patch || return 1
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1
-  patch -Np0 -i ${srcdir}/gcc-java-driver.patch || return 1
   patch -Np0 -i ${srcdir}/buildfix_new_bison.patch || return 1
 
   echo ${pkgver} > gcc/BASE-VER
diff --git a/abs/core-testing/intltool/ChangeLog b/abs/core-testing/intltool/ChangeLog
index f9a7192..4419f0f 100644
--- a/abs/core-testing/intltool/ChangeLog
+++ b/abs/core-testing/intltool/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-15  Eric Belanger  <eric@archlinux.org>
+
+	* intltool 0.40.6-1
+	* Upstream update
+
+2009-02-07  Eric Belanger  <eric@archlinux.org>
+
+	* Added I18N-HOWTO doc (close FS#12889)
+
 2008-11-28  Jan de Groot  <jgc@archlinux.org>
 
 	* intltool 0.40.5-1
diff --git a/abs/core-testing/intltool/PKGBUILD b/abs/core-testing/intltool/PKGBUILD
index b780d3b..d367e29 100644
--- a/abs/core-testing/intltool/PKGBUILD
+++ b/abs/core-testing/intltool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 19652 2008-11-28 20:22:55Z jgc $
+# $Id: PKGBUILD 30076 2009-03-16 03:02:39Z eric $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=intltool
-pkgver=0.40.5
+pkgver=0.40.6
 pkgrel=1
 pkgdesc="The internationalization tool collection"
 arch=('i686' 'x86_64')
@@ -11,12 +11,13 @@ url="http://freedesktop.org/wiki/Software/intltool"
 license=('GPL')
 depends=('perlxml')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3e7ded6f50d88cf8b8bb505eaf591775')
-sha1sums=('72a67f18dbc12e1af11bfff80100993107b4df84')
+md5sums=('69bc0353323112f42ad4f9cf351bc3e5')
+sha1sums=('4f6469e09e2c06a8072dffff36f84ff401d7ea75')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 doc/I18N-HOWTO ${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO || return 1
 }
diff --git a/abs/core-testing/libglade/PKGBUILD b/abs/core-testing/libglade/PKGBUILD
index c0bfa29..95eff9b 100644
--- a/abs/core-testing/libglade/PKGBUILD
+++ b/abs/core-testing/libglade/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 13455 2008-09-27 11:03:58Z jgc $
+# $Id: PKGBUILD 30217 2009-03-17 18:11:58Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libglade
-pkgver=2.6.3
+pkgver=2.6.4
 pkgrel=1
 pkgdesc="Allows you to load glade interface files in a program at runtime"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gtk2>=2.14.1' 'libxml2>=2.6.32')
+depends=('gtk2>=2.16.0' 'libxml2>=2.7.3')
 makedepends=('python' 'pkgconfig')
+optdepends=('python: libglade-convert script')
 options=('!libtool')
 install=glade.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2
 	libglade-2.0.1-nowarning.patch)
 url="http://www.gnome.org"
-md5sums=('1c359860b1a0f369f0b6e3f96fd985c2' '4f879c0ce550004905aa0fb24f25c353')
+md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
+         '4f879c0ce550004905aa0fb24f25c353')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libglade-2.0.1-nowarning.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" || return 1
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m755 libglade-convert ${pkgdir}/usr/bin/libglade-convert || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 libglade-convert "${pkgdir}/usr/bin/" || return 1
 }
diff --git a/abs/core-testing/smbclient/PKGBUILD b/abs/core-testing/smbclient/PKGBUILD
index c0034b3..349572b 100644
--- a/abs/core-testing/smbclient/PKGBUILD
+++ b/abs/core-testing/smbclient/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 22197 2008-12-22 22:08:42Z tpowa $
+# $Id: PKGBUILD [REDACTED]:39:47Z tpowa $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=smbclient
-pkgver=3.2.6
+pkgver=3.3.3
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pacman
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.2.6
-pkgrel=2
+_realver=3.3.3
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
-depends=('popt' 'libldap' 'libcap' 'heimdal>=1.2-1' 'db>=4.7' 'tdb=3.2.6')
+depends=('popt' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'tdb=3.3.3')
 source=(http://us1.samba.org/samba/ftp/samba-${_realver}.tar.gz)
 options=(!makeflags)
 
@@ -19,7 +19,7 @@ build() {
   cd ${srcdir}/samba-${_realver}/source
 
   ./configure --prefix=/usr --with-cifsmount --with-fhs --with-pam \
-              --with-datadir=/usr/share --with-configdir=/etc/samba \
+              --with-configdir=/etc/samba \
               --with-lockdir=/var/run/samba --with-ads --with-acl-support \
               --localstatedir=/var --with-syslog --with-pam_smbpass --disable-dnssd \
               --libdir=/usr/lib/samba
@@ -54,4 +54,4 @@ build() {
   done
   install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
 }
-md5sums=('0cd27c7afbb8211616eea4010f32271c')
+md5sums=('4d5835817416d1ffa30783af45c5a9ed')
diff --git a/abs/extra-testing/apache-ant/PKGBUILD b/abs/extra-testing/apache-ant/PKGBUILD
new file mode 100644
index 0000000..663cc19
--- /dev/null
+++ b/abs/extra-testing/apache-ant/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 24082 2009-01-12 21:42:39Z paul $
+# Contributor: Andrew Wright <andreww@photism.org>
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgname=apache-ant
+pkgver=1.7.1
+pkgrel=1
+pkgdesc="Ant is a java-based build tool."
+arch=(i686 x86_64)
+license=('APACHE')
+url="http://ant.apache.org/"
+depends=('java-runtime')
+makedepends=('java-environment')
+noextract=('junit3.8.1.zip')
+source=(http://archive.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
+        http://heanet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip)
+md5sums=('0d68db4a1ada5c91bcbf53cefd0c2fd7' '5110326e4b7f7497dfa60ede4b626751')
+
+build() {
+  cd ${startdir}/src || return 1
+  unzip junit3.8.1.zip || return 1
+
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  if [ -f /etc/profile.d/java-gcj-compat.sh ]; then
+    . /etc/profile.d/java-gcj-compat.sh
+  elif [ -f /etc/profile.d/jdk.sh ]; then
+    . /etc/profile.d/jre.sh
+    . /etc/profile.d/jdk.sh
+  fi
+
+   # we need the junit jar in the classpath to build ant
+  export CLASSPATH="${startdir}/src/junit3.8.1/junit.jar"
+
+  # build
+  mkdir dist || return 1
+  ./build.sh -Ddist.dir=dist/ dist || return 1
+
+  # install
+  export ANT_HOME="${startdir}/pkg/usr"
+  ./build.sh install-lite || return 1
+}
diff --git a/abs/extra-testing/gconf/01_xml-gettext-domain.patch b/abs/extra-testing/gconf/01_xml-gettext-domain.patch
new file mode 100644
index 0000000..7491ca8
--- /dev/null
+++ b/abs/extra-testing/gconf/01_xml-gettext-domain.patch
@@ -0,0 +1,299 @@
+# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
+# Ubuntu: https://bugs.launchpad.net/bugs/123025
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
+diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/backends/markup-tree.c gconf-2.25.0.new/backends/markup-tree.c
+--- gconf-2.25.0/backends/markup-tree.c	2009-01-10 05:55:08.000000000 +0100
++++ gconf-2.25.0.new/backends/markup-tree.c	2009-01-23 12:11:48.000000000 +0100
+@@ -52,6 +52,7 @@
+   char       *schema_name;
+   char       *mod_user;
+   GTime       mod_time;
++  char       *gettext_domain;
+ };
+ 
+ static LocalSchemaInfo* local_schema_info_new  (void);
+@@ -1351,6 +1352,7 @@
+     gconf_value_free (entry->value);
+   g_free (entry->schema_name);
+   g_free (entry->mod_user);
++  g_free (entry->gettext_domain);
+ 
+   g_slist_foreach (entry->local_schemas,
+                    (GFunc) local_schema_info_free,
+@@ -1593,6 +1595,8 @@
+                              gconf_schema_get_type (schema));
+       gconf_schema_set_owner (current_schema,
+                               gconf_schema_get_owner (schema));
++      gconf_schema_set_gettext_domain (current_schema,
++                              gconf_schema_get_gettext_domain (schema));
+     }
+ 
+   /* Update mod time */
+@@ -1805,6 +1809,8 @@
+       else if (c_local_schema && c_local_schema->long_desc)
+         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
+ 
++      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
++
+       return retval;
+     }
+ }
+@@ -2339,8 +2345,9 @@
+   const char *ltype;
+   const char *list_type;
+   const char *owner;
++
+   GConfValueType vtype;
+-  const char *dummy1, *dummy2, *dummy3, *dummy4;
++  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
+   
+ #if 0
+   g_assert (ELEMENT_IS ("entry") ||
+@@ -2377,6 +2384,7 @@
+                           "muser", &dummy2,
+                           "mtime", &dummy3,
+                           "schema", &dummy4,
++                          "gettext_domain", &dummy5,
+ 
+                           NULL))
+     return;
+@@ -2682,6 +2690,7 @@
+       const char *mtime;
+       const char *schema;
+       const char *type;
++      const char *gettext_domain;
+       const char *dummy1, *dummy2, *dummy3, *dummy4;
+       const char *dummy5, *dummy6, *dummy7;
+       GConfValue *value;
+@@ -2692,6 +2701,7 @@
+       mtime = NULL;
+       schema = NULL;
+       type = NULL;
++      gettext_domain = NULL;
+ 
+       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
+                               error,
+@@ -2700,6 +2710,7 @@
+                               "mtime", &mtime,
+                               "schema", &schema,
+                               "type", &type,
++                              "gettext_domain", &gettext_domain,
+                           
+                               /* These are allowed but we don't use them until
+                                * parse_value_element
+@@ -2767,6 +2778,9 @@
+        */
+       if (schema)
+         entry->schema_name = g_strdup (schema);
++
++      if (gettext_domain)
++        entry->gettext_domain = g_strdup (gettext_domain);
+     }
+   else
+     {
+@@ -3705,6 +3719,7 @@
+         GConfSchema *schema;
+         GConfValueType stype;
+         const char *owner;
++        const char *gettext_domain;
+         
+         schema = gconf_value_get_schema (value);
+ 
+@@ -3730,6 +3745,23 @@
+             
+             g_free (s);
+           }
++
++        gettext_domain = gconf_schema_get_gettext_domain (schema);
++        
++        if (gettext_domain)
++          {
++            char *s;
++
++            s = g_markup_escape_text (gettext_domain, -1);
++            
++            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
++              {
++                g_free (s);
++                return FALSE;
++              }
++            
++            g_free (s);
++          }
+         
+         if (stype == GCONF_VALUE_LIST)
+           {
+diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.c gconf-2.25.0.new/gconf/gconf-schema.c
+--- gconf-2.25.0/gconf/gconf-schema.c	2009-01-10 05:55:07.000000000 +0100
++++ gconf-2.25.0.new/gconf/gconf-schema.c	2009-01-23 12:11:48.000000000 +0100
+@@ -35,6 +35,7 @@
+   gchar* owner;        /* Name of creating application */
+   gchar* short_desc;   /* 40 char or less description, no newlines */
+   gchar* long_desc;    /* could be a paragraph or so */
++  gchar* gettext_domain; /* description gettext domain */
+   GConfValue* default_value; /* Default value of the key */
+ } GConfRealSchema;
+ 
+@@ -63,6 +64,7 @@
+   g_free (real->locale);
+   g_free (real->short_desc);
+   g_free (real->long_desc);
++  g_free (real->gettext_domain);
+   g_free (real->owner);
+ 
+   if (real->default_value)
+@@ -91,6 +93,8 @@
+ 
+   dest->long_desc = g_strdup (real->long_desc);
+ 
++  dest->gettext_domain = g_strdup (real->gettext_domain);
++
+   dest->owner = g_strdup (real->owner);
+ 
+   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
+@@ -136,6 +140,20 @@
+     REAL_SCHEMA (sc)->locale = NULL;
+ }
+ 
++void
++gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
++{
++  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
++  
++  if (REAL_SCHEMA (sc)->gettext_domain)
++    g_free (REAL_SCHEMA (sc)->gettext_domain);
++
++  if (domain)
++    REAL_SCHEMA (sc)->gettext_domain = g_strdup (domain);
++  else 
++    REAL_SCHEMA (sc)->gettext_domain = NULL;
++}
++
+ void          
+ gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
+ {
+@@ -228,6 +246,14 @@
+       return FALSE;
+     }
+ 
++  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
++    {
++      g_set_error (err, GCONF_ERROR,
++                   GCONF_ERROR_FAILED,
++                   _("Schema contains invalid UTF-8"));
++      return FALSE;
++    }
++
+   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
+     {
+       g_set_error (err, GCONF_ERROR,
+@@ -299,11 +325,22 @@
+ }
+ 
+ const char*
++gconf_schema_get_gettext_domain (const GConfSchema *schema)
++{
++  g_return_val_if_fail (schema != NULL, NULL);
++
++  return REAL_SCHEMA (schema)->gettext_domain;
++}
++
++const char*
+ gconf_schema_get_short_desc (const GConfSchema *schema)
+ {
+   g_return_val_if_fail (schema != NULL, NULL);
+ 
+-  return REAL_SCHEMA (schema)->short_desc;
++ if (REAL_SCHEMA (schema)->gettext_domain)
++    return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, REAL_SCHEMA (schema)->short_desc);
++  else
++    return REAL_SCHEMA (schema)->short_desc;
+ }
+ 
+ const char*
+@@ -311,7 +348,10 @@
+ {
+   g_return_val_if_fail (schema != NULL, NULL);
+ 
+-  return REAL_SCHEMA (schema)->long_desc;
++  if (REAL_SCHEMA (schema)->gettext_domain)
++    return dgettext(REAL_SCHEMA (schema)->gettext_domain, REAL_SCHEMA (schema)->long_desc);
++  else
++    return REAL_SCHEMA (schema)->long_desc;
+ }
+ 
+ const char*
+diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconf-schema.h gconf-2.25.0.new/gconf/gconf-schema.h
+--- gconf-2.25.0/gconf/gconf-schema.h	2009-01-10 05:55:07.000000000 +0100
++++ gconf-2.25.0.new/gconf/gconf-schema.h	2009-01-23 12:11:48.000000000 +0100
+@@ -48,6 +48,8 @@
+                                             GConfValueType  type);
+ void gconf_schema_set_locale               (GConfSchema    *sc,
+                                             const gchar    *locale);
++void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
++                                            const gchar    *domain);
+ void gconf_schema_set_short_desc           (GConfSchema    *sc,
+                                             const gchar    *desc);
+ void gconf_schema_set_long_desc            (GConfSchema    *sc,
+@@ -65,6 +67,7 @@
+ GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
+ GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
+ const char*    gconf_schema_get_locale        (const GConfSchema *schema);
++const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
+ const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
+ const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
+ const char*    gconf_schema_get_owner         (const GConfSchema *schema);
+diff -Nur -x '*.orig' -x '*~' gconf-2.25.0/gconf/gconftool.c gconf-2.25.0.new/gconf/gconftool.c
+--- gconf-2.25.0/gconf/gconftool.c	2009-01-10 05:55:07.000000000 +0100
++++ gconf-2.25.0.new/gconf/gconftool.c	2009-01-23 12:11:48.000000000 +0100
+@@ -3293,6 +3293,7 @@
+   GConfValueType cdr_type;
+   GConfValue* global_default;
+   GHashTable* hash;
++  gchar* gettext_domain;
+ };
+ 
+ static int
+@@ -3545,6 +3546,15 @@
+               else
+                 g_printerr (_("WARNING: empty <applyto> node"));
+             }
++          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
++            {
++              tmp = (char *)xmlNodeGetContent(iter);
++              if (tmp)
++                {
++                  info->gettext_domain = g_strdup(tmp);
++                  xmlFree(tmp);
++                }
++            }
+           else
+             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
+ 			iter->name);
+@@ -3634,6 +3644,9 @@
+   if (info->owner != NULL)
+     gconf_schema_set_owner(schema, info->owner);
+ 
++  if (info->gettext_domain != NULL)
++    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
++
+   xmlFree(name);
+ 
+   /* Locale-specific info */
+@@ -3763,6 +3776,7 @@
+   info.apply_to = NULL;
+   info.owner = NULL;
+   info.global_default = NULL;
++  info.gettext_domain = NULL;
+   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
+   
+   extract_global_info(node, &info);
+@@ -3799,6 +3813,8 @@
+             ;  /* nothing */
+           else if (strcmp((char *)iter->name, "applyto") == 0)
+             ;  /* nothing */
++          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
++            ;  /* nothing */
+           else if (strcmp((char *)iter->name, "locale") == 0)
+             {
+               process_locale_info(iter, &info);
diff --git a/abs/extra-testing/gconf/05_from_vuntz_gconf2-pk-default-path.patch b/abs/extra-testing/gconf/05_from_vuntz_gconf2-pk-default-path.patch
new file mode 100644
index 0000000..c303e19
--- /dev/null
+++ b/abs/extra-testing/gconf/05_from_vuntz_gconf2-pk-default-path.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gconf-2.25.2/defaults/gconf-defaults.c gconf-2.25.2.new/defaults/gconf-defaults.c
+--- gconf-2.25.2/defaults/gconf-defaults.c	2009-02-17 01:15:19.000000000 +0100
++++ gconf-2.25.2.new/defaults/gconf-defaults.c	2009-02-17 11:12:39.000000000 +0100
+@@ -507,7 +507,7 @@
+ 	else {
+ 		annotation_key = "org.gnome.gconf.defaults.set-system.prefix"; 
+ 		default_action = "org.gnome.gconf.defaults.set-system";
+-		dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
++		dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
+ 	}
+ 
+ 	for (i = 0; includes[i]; i++) {
diff --git a/abs/extra-testing/gconf/PKGBUILD b/abs/extra-testing/gconf/PKGBUILD
index 0fc2fb0..053e26a 100644
--- a/abs/extra-testing/gconf/PKGBUILD
+++ b/abs/extra-testing/gconf/PKGBUILD
@@ -1,29 +1,38 @@
-# $Id: PKGBUILD 22335 2008-12-26 13:57:57Z jgc $
+# $Id: PKGBUILD 33882 2009-04-05 19:42:30Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
-pkgver=2.24.0
-pkgrel=2
+pkgver=2.26.0
+pkgrel=3
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('orbit2>=2.14.16' 'gtk2>=2.14.3' 'libxml2>=2.6.32' 'policykit>=0.9' 'libldap>=2.3.43')
-makedepends=('pkgconfig' 'intltool>=0.40.4' 'gtk-doc>=1.10')
+depends=('orbit2>=2.14.17' 'gtk2>=2.16.0' 'libxml2>=2.7.3' 'policykit>=0.9' 'libldap>=2.3.43')
+makedepends=('pkgconfig' 'intltool>=0.40.6' 'gtk-doc>=1.10')
 options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.24/GConf-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.26/GConf-${pkgver}.tar.bz2
 	gconf-merge-schema
 	gconfpkg
-	gconf-reload.patch)
-md5sums=('4971d96f5ba94fe4a69396267bd5afe8'
-         '1412bafb06f7d8a9601c8f1c4d72cc06'
+	gconf-reload.patch
+	xml-gettext-domain.patch
+	05_from_vuntz_gconf2-pk-default-path.patch)
+md5sums=('b010f0de356ea093c6a73778b13de956'
+         '240b473fa17b748fc9020caf372d936c'
          'b745f04b4121d8724c002b14a4c110b6'
-         'cfcc8e15be7b8a48de4aa34336ff6090')
+         'cfcc8e15be7b8a48de4aa34336ff6090'
+         '1c8a0eece8202c4c2fbba596fe0d9c67'
+         'd9a02aee25ec04f2340f4e98963aabb0')
 
 build() {
   cd "${srcdir}/GConf-${pkgver}"
+  # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1
+  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
+  patch -Np1 -i "${srcdir}/xml-gettext-domain.patch" || return 1
+  # Patch from Ubuntu: change default path
+  patch -Np1 -i "${srcdir}/05_from_vuntz_gconf2-pk-default-path.patch" || return 1
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1
@@ -33,6 +42,7 @@ build() {
 	      --disable-static --enable-defaults-service || return 1
   make pkglibdir=/usr/lib/GConf || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" || return 1
   install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" || return 1
   install -d -m755 "${pkgdir}/usr/sbin"
   install -m755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/" || return 1
diff --git a/abs/extra-testing/gconf/gconf-merge-schema b/abs/extra-testing/gconf/gconf-merge-schema
index 323e0ec..992c162 100755
--- a/abs/extra-testing/gconf/gconf-merge-schema
+++ b/abs/extra-testing/gconf/gconf-merge-schema
@@ -1,22 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 if [ ! "$1" -a ! "$2" ]; then
-  echo "Usage: $0 output.schemas file1.schemas [file2.schemas [...]]"
+  echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
   exit 1
 fi
 
 OUTFILE="$1"
+DOMAIN=""
 shift
 
+if [ "$1" = "--domain" ]; then
+  shift
+  DOMAIN=$1
+  shift
+fi
+
 echo '<?xml version="1.0"?>' > "$OUTFILE"
 echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
 
 while [ "$1" ]; do
   if [ -f "$1" ]; then
-    sed -e '/<?xml/d' -e 's|<gconfschemafile>||g' -e 's|</gconfschemafile>||g' \
-        -e 's|<schemalist>||g' -e 's|</schemalist>||g' \
-          "$1" >> "$OUTFILE"
+    sed -e '/<?xml/d' \
+        -e 's|<gconfschemafile>||g' \
+	-e 's|</gconfschemafile>||g' \
+        -e 's|<schemalist>||g' \
+	-e 's|</schemalist>||g' "$1" >> "$OUTFILE"
   fi
   shift
 done
   
 echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
+if [ "$DOMAIN" != "" ]; then
+  sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
+fi
diff --git a/abs/extra-testing/gconf/gconf.install b/abs/extra-testing/gconf/gconf.install
index 7743def..4e792c4 100644
--- a/abs/extra-testing/gconf/gconf.install
+++ b/abs/extra-testing/gconf/gconf.install
@@ -1,10 +1,8 @@
-# arg 1:  the new package version
 post_install() {
   ldconfig -r .
+  chmod 755 etc/gconf/gconf.xml.system
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   ldconfig -r .
   if [ `vercmp $2 2.18.0.1-2` -lt 0 ]; then
@@ -19,19 +17,10 @@ post_upgrade() {
     fi
     echo "done."
   fi
+  chmod 755 etc/gconf/gconf.xml.system
     
   PID=`pidof gconfd-2`
   if [ ! -z "${PID}" ]; then
     kill ${PID}
   fi
 }
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/gconf/xml-gettext-domain.patch b/abs/extra-testing/gconf/xml-gettext-domain.patch
new file mode 100644
index 0000000..1c5a78e
--- /dev/null
+++ b/abs/extra-testing/gconf/xml-gettext-domain.patch
@@ -0,0 +1,367 @@
+diff -ru GConf-2.26.0/backends/markup-tree.c GConf-2.26.0.patched/backends/markup-tree.c
+--- GConf-2.26.0/backends/markup-tree.c	2009-02-16 18:17:43.000000000 +0000
++++ GConf-2.26.0.patched/backends/markup-tree.c	2009-04-05 19:36:42.000000000 +0000
+@@ -52,6 +52,7 @@
+   char       *schema_name;
+   char       *mod_user;
+   GTime       mod_time;
++  char       *gettext_domain;
+ };
+ 
+ static LocalSchemaInfo* local_schema_info_new  (void);
+@@ -1351,6 +1352,7 @@
+     gconf_value_free (entry->value);
+   g_free (entry->schema_name);
+   g_free (entry->mod_user);
++  g_free (entry->gettext_domain);
+ 
+   g_slist_foreach (entry->local_schemas,
+                    (GFunc) local_schema_info_free,
+@@ -1593,6 +1595,8 @@
+                              gconf_schema_get_type (schema));
+       gconf_schema_set_owner (current_schema,
+                               gconf_schema_get_owner (schema));
++      gconf_schema_set_gettext_domain (current_schema,
++                              gconf_schema_get_gettext_domain (schema));
+     }
+ 
+   /* Update mod time */
+@@ -1805,6 +1809,8 @@
+       else if (c_local_schema && c_local_schema->long_desc)
+         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
+ 
++      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
++
+       return retval;
+     }
+ }
+@@ -2339,8 +2345,9 @@
+   const char *ltype;
+   const char *list_type;
+   const char *owner;
++
+   GConfValueType vtype;
+-  const char *dummy1, *dummy2, *dummy3, *dummy4;
++  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
+   
+ #if 0
+   g_assert (ELEMENT_IS ("entry") ||
+@@ -2377,6 +2384,7 @@
+                           "muser", &dummy2,
+                           "mtime", &dummy3,
+                           "schema", &dummy4,
++                          "gettext_domain", &dummy5,
+ 
+                           NULL))
+     return;
+@@ -2683,6 +2691,7 @@
+       const char *mtime;
+       const char *schema;
+       const char *type;
++      const char *gettext_domain;
+       const char *dummy1, *dummy2, *dummy3, *dummy4;
+       const char *dummy5, *dummy6, *dummy7;
+       GConfValue *value;
+@@ -2693,6 +2702,7 @@
+       mtime = NULL;
+       schema = NULL;
+       type = NULL;
++      gettext_domain = NULL;
+ 
+       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
+                               error,
+@@ -2701,6 +2711,7 @@
+                               "mtime", &mtime,
+                               "schema", &schema,
+                               "type", &type,
++                              "gettext_domain", &gettext_domain,
+                           
+                               /* These are allowed but we don't use them until
+                                * parse_value_element
+@@ -2768,6 +2779,9 @@
+        */
+       if (schema)
+         entry->schema_name = g_strdup (schema);
++
++      if (gettext_domain)
++        entry->gettext_domain = g_strdup (gettext_domain);
+     }
+   else
+     {
+@@ -3716,6 +3730,7 @@
+         GConfSchema *schema;
+         GConfValueType stype;
+         const char *owner;
++        const char *gettext_domain;
+         
+         schema = gconf_value_get_schema (value);
+ 
+@@ -3741,6 +3756,23 @@
+             
+             g_free (s);
+           }
++
++        gettext_domain = gconf_schema_get_gettext_domain (schema);
++        
++        if (gettext_domain)
++          {
++            char *s;
++
++            s = g_markup_escape_text (gettext_domain, -1);
++            
++            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
++              {
++                g_free (s);
++                return FALSE;
++              }
++            
++            g_free (s);
++          }
+         
+         if (stype == GCONF_VALUE_LIST)
+           {
+Only in GConf-2.26.0.patched/backends: markup-tree.c.orig
+diff -ru GConf-2.26.0/doc/gconf-1.0.dtd GConf-2.26.0.patched/doc/gconf-1.0.dtd
+--- GConf-2.26.0/doc/gconf-1.0.dtd	2008-05-09 14:29:51.000000000 +0000
++++ GConf-2.26.0.patched/doc/gconf-1.0.dtd	2009-04-05 19:36:42.000000000 +0000
+@@ -7,7 +7,7 @@
+ <!-- A single schema. What I am trying to say is "this set of
+ elements, in any order". Duplicate elements (apart from <locale>) are
+ not allowed). -->
+-<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
++<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
+ 
+ <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
+ <!ELEMENT key     (#PCDATA)>
+diff -ru GConf-2.26.0/gconf/GConfX.idl GConf-2.26.0.patched/gconf/GConfX.idl
+--- GConf-2.26.0/gconf/GConfX.idl	2008-05-09 14:29:51.000000000 +0000
++++ GConf-2.26.0.patched/gconf/GConfX.idl	2009-04-05 19:36:46.000000000 +0000
+@@ -16,6 +16,7 @@
+   string short_desc;
+   string long_desc;
+   string owner;
++  string gettext_domain;
+   // Work around lack of recursive data types
+   string encoded_default_value;
+ };
+diff -ru GConf-2.26.0/gconf/gconf-internals.c GConf-2.26.0.patched/gconf/gconf-internals.c
+--- GConf-2.26.0/gconf/gconf-internals.c	2009-03-17 02:47:13.000000000 +0000
++++ GConf-2.26.0.patched/gconf/gconf-internals.c	2009-04-05 19:36:46.000000000 +0000
+@@ -513,6 +513,7 @@
+   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
+   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
+   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
++  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
+ 
+   {
+     gchar* encoded;
+@@ -600,6 +601,14 @@
+         gconf_schema_set_owner(sc, cs->owner);
+     }
+       
++  if (*cs->gettext_domain != '\0')
++    {
++      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
++        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
++      else
++        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
++    }
++      
+   {
+     GConfValue* val;
+ 
+diff -ru GConf-2.26.0/gconf/gconf-schema.c GConf-2.26.0.patched/gconf/gconf-schema.c
+--- GConf-2.26.0/gconf/gconf-schema.c	2008-10-09 17:51:31.000000000 +0000
++++ GConf-2.26.0.patched/gconf/gconf-schema.c	2009-04-05 19:36:42.000000000 +0000
+@@ -32,9 +32,10 @@
+   GConfValueType car_type; /* Pair car type of the described entry */
+   GConfValueType cdr_type; /* Pair cdr type of the described entry */
+   gchar* locale;       /* Schema locale */
+-  gchar* owner;        /* Name of creating application */
++  const gchar* owner;        /* Name of creating application */
+   gchar* short_desc;   /* 40 char or less description, no newlines */
+   gchar* long_desc;    /* could be a paragraph or so */
++  const gchar* gettext_domain; /* description gettext domain */
+   GConfValue* default_value; /* Default value of the key */
+ } GConfRealSchema;
+ 
+@@ -63,7 +64,6 @@
+   g_free (real->locale);
+   g_free (real->short_desc);
+   g_free (real->long_desc);
+-  g_free (real->owner);
+ 
+   if (real->default_value)
+     gconf_value_free (real->default_value);
+@@ -91,7 +91,9 @@
+ 
+   dest->long_desc = g_strdup (real->long_desc);
+ 
+-  dest->owner = g_strdup (real->owner);
++  dest->gettext_domain = real->gettext_domain;
++
++  dest->owner = real->owner;
+ 
+   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
+   
+@@ -136,6 +138,17 @@
+     REAL_SCHEMA (sc)->locale = NULL;
+ }
+ 
++void
++gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
++{
++  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
++  
++  if (domain)
++    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
++  else 
++    REAL_SCHEMA (sc)->gettext_domain = NULL;
++}
++
+ void          
+ gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
+ {
+@@ -169,11 +182,8 @@
+ {
+   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
+   
+-  if (REAL_SCHEMA (sc)->owner)
+-    g_free (REAL_SCHEMA (sc)->owner);
+-
+   if (owner)
+-    REAL_SCHEMA (sc)->owner = g_strdup (owner);
++    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
+   else
+     REAL_SCHEMA (sc)->owner = NULL;
+ }
+@@ -228,6 +238,14 @@
+       return FALSE;
+     }
+ 
++  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
++    {
++      g_set_error (err, GCONF_ERROR,
++                   GCONF_ERROR_FAILED,
++                   _("Schema contains invalid UTF-8"));
++      return FALSE;
++    }
++
+   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
+     {
+       g_set_error (err, GCONF_ERROR,
+@@ -299,11 +317,29 @@
+ }
+ 
+ const char*
++gconf_schema_get_gettext_domain (const GConfSchema *schema)
++{
++  g_return_val_if_fail (schema != NULL, NULL);
++
++  return REAL_SCHEMA (schema)->gettext_domain;
++}
++
++static inline const char *
++schema_translate (const GConfSchema *schema,
++                  const char        *string)
++{
++ if (REAL_SCHEMA (schema)->gettext_domain)
++    return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
++  else
++    return string;
++}
++
++const char*
+ gconf_schema_get_short_desc (const GConfSchema *schema)
+ {
+   g_return_val_if_fail (schema != NULL, NULL);
+ 
+-  return REAL_SCHEMA (schema)->short_desc;
++ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
+ }
+ 
+ const char*
+@@ -311,7 +347,7 @@
+ {
+   g_return_val_if_fail (schema != NULL, NULL);
+ 
+-  return REAL_SCHEMA (schema)->long_desc;
++ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
+ }
+ 
+ const char*
+diff -ru GConf-2.26.0/gconf/gconf-schema.h GConf-2.26.0.patched/gconf/gconf-schema.h
+--- GConf-2.26.0/gconf/gconf-schema.h	2008-10-09 17:51:29.000000000 +0000
++++ GConf-2.26.0.patched/gconf/gconf-schema.h	2009-04-05 19:36:42.000000000 +0000
+@@ -48,6 +48,8 @@
+                                             GConfValueType  type);
+ void gconf_schema_set_locale               (GConfSchema    *sc,
+                                             const gchar    *locale);
++void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
++                                            const gchar    *domain);
+ void gconf_schema_set_short_desc           (GConfSchema    *sc,
+                                             const gchar    *desc);
+ void gconf_schema_set_long_desc            (GConfSchema    *sc,
+@@ -65,6 +67,7 @@
+ GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
+ GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
+ const char*    gconf_schema_get_locale        (const GConfSchema *schema);
++const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
+ const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
+ const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
+ const char*    gconf_schema_get_owner         (const GConfSchema *schema);
+diff -ru GConf-2.26.0/gconf/gconftool.c GConf-2.26.0.patched/gconf/gconftool.c
+--- GConf-2.26.0/gconf/gconftool.c	2009-02-16 18:17:43.000000000 +0000
++++ GConf-2.26.0.patched/gconf/gconftool.c	2009-04-05 19:36:42.000000000 +0000
+@@ -3295,6 +3295,7 @@
+   GConfValueType cdr_type;
+   GConfValue* global_default;
+   GHashTable* hash;
++  gchar* gettext_domain;
+ };
+ 
+ static int
+@@ -3547,6 +3548,15 @@
+               else
+                 g_printerr (_("WARNING: empty <applyto> node"));
+             }
++          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
++            {
++              tmp = (char *)xmlNodeGetContent(iter);
++              if (tmp)
++                {
++                  info->gettext_domain = g_strdup(tmp);
++                  xmlFree(tmp);
++                }
++            }
+           else
+             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
+ 			iter->name);
+@@ -3636,6 +3646,9 @@
+   if (info->owner != NULL)
+     gconf_schema_set_owner(schema, info->owner);
+ 
++  if (info->gettext_domain != NULL)
++    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
++
+   xmlFree(name);
+ 
+   /* Locale-specific info */
+@@ -3765,6 +3778,7 @@
+   info.apply_to = NULL;
+   info.owner = NULL;
+   info.global_default = NULL;
++  info.gettext_domain = NULL;
+   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
+   
+   extract_global_info(node, &info);
+@@ -3801,6 +3815,8 @@
+             ;  /* nothing */
+           else if (strcmp((char *)iter->name, "applyto") == 0)
+             ;  /* nothing */
++          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
++            ;  /* nothing */
+           else if (strcmp((char *)iter->name, "locale") == 0)
+             {
+               process_locale_info(iter, &info);
+Only in GConf-2.26.0.patched/gconf: gconftool.c.orig
diff --git a/abs/extra-testing/gnome-vfs/PKGBUILD b/abs/extra-testing/gnome-vfs/PKGBUILD
index dc848be..9a54cdd 100644
--- a/abs/extra-testing/gnome-vfs/PKGBUILD
+++ b/abs/extra-testing/gnome-vfs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 20541 2008-12-05 16:30:04Z allan $
+# $Id: PKGBUILD 30314 2009-03-18 21:34:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=2
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.24' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.23' 'smbclient>=3.0.31' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2' 'gnutls>=2.4.1')
-makedepends=('perlxml' 'pkgconfig' 'intltool')
+depends=('fam' 'gconf>=2.26.0-2' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 conflicts=(gnome-vfs-samba)
 provides=(gnome-vfs-samba)
@@ -17,10 +17,10 @@ url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
 	hal-show-volume-names.patch)
-md5sums=('870ee8861bfcaeb852934e95657ef83e' '109d07aa1dc8cb6523c47c4984047dce')
+md5sums=('100f9af16dc659e375ee8da45175a28d' '109d07aa1dc8cb6523c47c4984047dce')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   #Archlinux patch (b.g.o #321498)
   patch -Np1 -i ${startdir}/src/hal-show-volume-names.patch || return 1
 
@@ -29,11 +29,11 @@ build() {
 	--libexecdir=/usr/lib/gnome-vfs-2.0 \
   	--enable-samba --enable-hal \
         --enable-avahi --disable-howl \
-	--disable-openssl --enable-gnutls
+	--disable-openssl --enable-gnutls || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/abs/extra-testing/gnome-vfs/gnome-vfs.install b/abs/extra-testing/gnome-vfs/gnome-vfs.install
index 0a77ef7..793a3e7 100644
--- a/abs/extra-testing/gnome-vfs/gnome-vfs.install
+++ b/abs/extra-testing/gnome-vfs/gnome-vfs.install
@@ -15,8 +15,3 @@ post_upgrade() {
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/libbonobo/PKGBUILD b/abs/extra-testing/libbonobo/PKGBUILD
index f913979..93e2538 100644
--- a/abs/extra-testing/libbonobo/PKGBUILD
+++ b/abs/extra-testing/libbonobo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 13024 2008-09-25 19:31:19Z jgc $
+# $Id: PKGBUILD 29425 2009-03-08 17:32:56Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonobo
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=1
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('orbit2>=2.14.16' 'libxml2>=2.6.32' 'dbus-glib>=0.76')
-makedepends=('perlxml' 'pkgconfig' 'flex')
+depends=('orbit2>=2.14.17' 'libxml2>=2.7.3' 'dbus-glib>=0.78')
+makedepends=('intltool' 'pkgconfig' 'flex')
 options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
 replaces=('bonobo-activation')
@@ -16,15 +16,15 @@ url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2
 	bonobo-activation-config.xml)
 install=libbonobo.install
-md5sums=('b9dd7fcd377945b227db393ac4fa3c37'
+md5sums=('8868b6083392964a6969547ceb8d7cd1'
          '6392efaca30a26f826eafc4b8ccbc01f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/bonobo || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -m644 ${startdir}/src/bonobo-activation-config.xml ${startdir}/pkg/etc/bonobo-activation/ || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1
 }
diff --git a/abs/extra-testing/libbonoboui/PKGBUILD b/abs/extra-testing/libbonoboui/PKGBUILD
index 8ca58fc..b008798 100644
--- a/abs/extra-testing/libbonoboui/PKGBUILD
+++ b/abs/extra-testing/libbonoboui/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 13050 2008-09-25 19:57:07Z jgc $
+# $Id: PKGBUILD 29428 2009-03-08 17:35:50Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonoboui
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=1
 pkgdesc="User Interface library for Bonobo"
 arch=(i686 x86_64)
@@ -12,13 +12,13 @@ makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2076638f9aa9565c12b2bc264ecc4f18')
+md5sums=('9ff3ec1c7aefd0b1a15a5b21ecc7b4e4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/share/applications/bonobo-browser.desktop
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
 }
diff --git a/abs/extra-testing/libgda/PKGBUILD b/abs/extra-testing/libgda/PKGBUILD
new file mode 100644
index 0000000..7ecbd20
--- /dev/null
+++ b/abs/extra-testing/libgda/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 36066 2009-04-19 20:31:09Z jgc $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+pkgname=libgda
+pkgver=4.0.2
+pkgrel=1
+pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('glib2>=2.20.1' 'libxslt' 'db>=4.7' 'ncurses>=5.7-2' 'libsoup>=2.26.1'
+         'libmysqlclient>=5.1.32-2' 'postgresql-libs>=8.3.7' 'libldap>=2.3.43-3' 'unixodbc' 'sqlite3>=3.6.13')
+makedepends=('intltool' 'pkgconfig' 'openjdk6')
+options=('!libtool')
+url="http://www.gnome-db.org"
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/4.0/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('cd79f6542cdd9477017b76b5f81c776f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/extra-testing/libgda/bdb43.patch b/abs/extra-testing/libgda/bdb43.patch
new file mode 100644
index 0000000..3fe6e93
--- /dev/null
+++ b/abs/extra-testing/libgda/bdb43.patch
@@ -0,0 +1,18 @@
+diff -r -u libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c libgda-1.2.0/providers/bdb/gda-bdb-recordset.c
+--- libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c	2003-12-17 11:27:02.000000000 +0000
++++ libgda-1.2.0/providers/bdb/gda-bdb-recordset.c	2005-02-19 15:43:12.000000000 +0000
+@@ -227,10 +227,14 @@
+ 
+ 	/* get the number of records in the database */
+ 	ret = dbp->stat (dbp,
++#if BDB_VERSION > 40300
++			 NULL,
++#endif
+ 			 &statp,
+ #if BDB_VERSION < 40000
+ 			 NULL,
+ #endif
++
+ 			 0);
+ 	if (ret != 0) {
+ 		gda_connection_add_error (cnc, gda_bdb_make_error (ret));
diff --git a/abs/extra-testing/libgda/libgda.install b/abs/extra-testing/libgda/libgda.install
new file mode 100644
index 0000000..6420004
--- /dev/null
+++ b/abs/extra-testing/libgda/libgda.install
@@ -0,0 +1,16 @@
+post_install() {
+  scrollkeeper-update -q -p var/lib/scrollkeeper
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/abs/extra-testing/libgnome/PKGBUILD b/abs/extra-testing/libgnome/PKGBUILD
index 1785596..9197e0f 100644
--- a/abs/extra-testing/libgnome/PKGBUILD
+++ b/abs/extra-testing/libgnome/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 13047 2008-09-25 19:54:22Z jgc $ 
+# $Id: PKGBUILD 30321 2009-03-18 21:50:51Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnome
-pkgver=2.24.1
-pkgrel=1
+pkgver=2.26.0
+pkgrel=2
 pkgdesc="Common libraries for GNOME"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gnome-vfs>=2.24.0' 'esd>=0.2.40' 'libbonobo>=2.24.0')
-makedepends=('pkgconfig' 'perlxml')
+depends=('gnome-vfs>=2.24.1-2' 'esound>=0.2.41' 'libbonobo>=2.24.1')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=libgnome.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3b2a30329898b37b2461b3aa886e5ad9')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a5634fe9ddc54bbb726cbaaa35abc0b9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/abs/extra-testing/libgnome/libgnome.install b/abs/extra-testing/libgnome/libgnome.install
index ab307b1..db4e04d 100644
--- a/abs/extra-testing/libgnome/libgnome.install
+++ b/abs/extra-testing/libgnome/libgnome.install
@@ -15,8 +15,3 @@ post_upgrade() {
 pre_remove() {
   usr/sbin/gconfpkg --install ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/libgnomecanvas/PKGBUILD b/abs/extra-testing/libgnomecanvas/PKGBUILD
index 2fa25fb..7e419ed 100644
--- a/abs/extra-testing/libgnomecanvas/PKGBUILD
+++ b/abs/extra-testing/libgnomecanvas/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 18534 2008-11-06 23:21:50Z jgc $
+# $Id: PKGBUILD 30223 2009-03-17 18:18:11Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomecanvas
-pkgver=2.20.1.1
-pkgrel=2
+pkgver=2.26.0
+pkgrel=1
 pkgdesc="The GNOME Canvas library"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libglade>=2.6.3' 'libart-lgpl>=2.3.20')
-makedepends=('perlxml' 'pkgconfig')
+depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20')
+makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('948ed771d2957d24a0c9a414e9581055')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9bbc635e5ae70e63af071af74ba7e72f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/extra-testing/libgnomekbd/PKGBUILD b/abs/extra-testing/libgnomekbd/PKGBUILD
index b9ad8e9..8aab901 100644
--- a/abs/extra-testing/libgnomekbd/PKGBUILD
+++ b/abs/extra-testing/libgnomekbd/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 13643 2008-09-27 20:48:15Z jgc $
+# $Id: PKGBUILD 30447 2009-03-19 22:15:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomekbd
-pkgver=2.24.0
+pkgver=2.26.0
 pkgrel=1
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxklavier>=3.7' 'gconf>=2.24.0' 'libglade>=2.6.3')
+depends=('libxklavier>=3.9' 'gconf>=2.26.0-2' 'libglade>=2.6.4')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('43e4d090bc67a1984bebf551637783fd')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('aee58c088c4fd980e1bf813ea813c156')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +23,6 @@ build() {
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnomekbd ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/abs/extra-testing/libgnomeui/PKGBUILD b/abs/extra-testing/libgnomeui/PKGBUILD
index db9a7ad..f52b649 100644
--- a/abs/extra-testing/libgnomeui/PKGBUILD
+++ b/abs/extra-testing/libgnomeui/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 13061 2008-09-25 20:01:10Z jgc $
+# $Id: PKGBUILD 29431 2009-03-08 17:37:38Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeui
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=1
 pkgdesc="User Interface library for GNOME"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('libbonoboui>=2.24.0' 'gnome-keyring>=2.24.0')
-makedepends=('perlxml' 'pkgconfig')
+depends=('libbonoboui>=2.24.1' 'gnome-keyring>=2.24.1')
+makedepends=('intltool' 'pkgconfig')
 options=('!libtool' 'force')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7d50e1fc4c1ee3c268b26e8dfe7e677b')
+md5sums=('8e7d36dd1decfcf5cc4d5cb93bc4d217')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/libgnomeui || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/extra-testing/libgtop/PKGBUILD b/abs/extra-testing/libgtop/PKGBUILD
index 1cfd6c0..da34a59 100644
--- a/abs/extra-testing/libgtop/PKGBUILD
+++ b/abs/extra-testing/libgtop/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 24718 2009-01-20 09:57:05Z douglas $
+# $Id: PKGBUILD 35522 2009-04-13 20:24:53Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtop
-pkgver=2.24.3
+pkgver=2.26.1
 pkgrel=1
 pkgdesc="A library that read information about processes and the running system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.18.4' 'libxau' 'texinfo')
+depends=('glib2>=2.20.1' 'libxau' 'texinfo')
 install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool')
 url="http://www.gnome.org/"
-md5sums=('051de81fd37d33e7abee828fd4c12cba')
+md5sums=('49fe5c91a6bbc103a0a05c6854a6cc11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/extra-testing/libidl2/PKGBUILD b/abs/extra-testing/libidl2/PKGBUILD
index 685801d..488909a 100644
--- a/abs/extra-testing/libidl2/PKGBUILD
+++ b/abs/extra-testing/libidl2/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 10037 2008-08-23 13:36:30Z jgc $
+# $Id: PKGBUILD 30208 2009-03-17 17:59:14Z jgc $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=libidl2
-pkgver=0.8.11
+pkgver=0.8.13
 pkgrel=1
 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('glib2>=2.16.5')
+depends=('glib2>=2.20.0' 'texinfo')
 makedepends=('pkgconfig')
 install=libidl2.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2)
 url="http://www.gnome.org"
-md5sums=('9d0d4895fc23f7de9514fb13f0fdc9ba')
+md5sums=('b43b289a859eb38a710f70622c46e571')
 
 build() {
-  cd ${startdir}/src/libIDL-${pkgver}
+  cd "${srcdir}/libIDL-${pkgver}"
   ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
   
-  rm -f ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
+  rm -f "${pkgdir}/usr/share/info/dir"
+  gzip -9nf "${pkgdir}/usr/share/info/"*
 }
diff --git a/abs/extra-testing/libxp/PKGBUILD b/abs/extra-testing/libxp/PKGBUILD
new file mode 100644
index 0000000..1812082
--- /dev/null
+++ b/abs/extra-testing/libxp/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 4458 2008-07-07 16:34:45Z jgc $
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libxp
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="X11 X Print Library"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxext' 'printproto')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2)
+md5sums=('0f4ac39108c1ae8c443cdfac259b58fa')
+
+build() {
+  cd ${srcdir}/libXp-${pkgver}
+  ./configure --prefix=/usr || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+}
diff --git a/abs/extra-testing/openjdk6/PKGBUILD b/abs/extra-testing/openjdk6/PKGBUILD
new file mode 100644
index 0000000..22ee813
--- /dev/null
+++ b/abs/extra-testing/openjdk6/PKGBUILD
@@ -0,0 +1,155 @@
+# $Id: PKGBUILD 29222 2009-03-06 20:55:45Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=openjdk6
+pkgver=1.5
+_icedteaver=1.5pre
+pkgrel=0.1
+_date=20090305
+pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+url='http://icedtea.classpath.org'
+arch=('i686' 'x86_64')
+license=('GPL')
+_openjdk_version=b14
+_openjdk_date=25_nov_2008
+_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
+depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme')
+makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
+conflicts=('java-environment' 'java-runtime')
+provides=('java-environment=6' 'java-runtime=6')
+options=(!emptydirs)
+install=openjdk6.install
+source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+	#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
+	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
+	fix_jdk_cmds_path.diff
+	fix_corba_cmds_path.diff
+	gcjwebplugin_xulrunner.diff
+	aatext_by_default.diff
+	fontconfig-paths.diff
+	openjdk6.profile)
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
+md5sums=('9f9773a822156dd3d576d83d794364ce'
+         'd57bf545dc50d41588b43112393dac26'
+         '1c3510387dccdb4907d0fd2f1c58e372'
+         '5da3e39fa60985576c4f37d1491efbe2'
+         'f7e7a212e50abb56a6ef1a2b1bd27405'
+         'ed2e808df2d2fc2ea7dae5139d475192'
+         'ef60d567c0d9bad111212851220deafd'
+         '104380f0b900c840141e572a7fb70c27'
+         'd0703088e10aa957c037644ab88d716d')
+
+build() {
+  # for hg checkout install mercurial and
+#  mkdir ${srcdir}/icedtea6-${_date}
+#  cd ${srcdir}/icedtea6-${_date}
+#  hg clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+#  tar -cvjf ../../icedtea6-${_date}.tar.bz2 *
+#  return 1
+
+  unset JAVA_HOME
+  unset CLASSPATH
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=amd64
+  else
+    _arch=i586
+  fi
+  _javaver=1.6.0
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6
+#  cd ${srcdir}/icedtea6-${_icedteaver}
+  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
+  ln -s ${srcdir}/${_hotspotver}.tar.gz .
+
+  # fix xulrunner linking
+  patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1
+
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
+#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
+
+  ./autogen.sh
+  autoreconf # needed due to mercurial build
+
+  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
+  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+  unset MAKEFLAGS
+
+  if [ -x ${_jvmdir}/bin/javac ]; then
+    JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}"
+  elif [ -x /opt/java/bin/javac ]; then
+    JCONF="--with-openjdk --with-openjdk-home=/opt/java"
+  elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then
+    JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac"
+  elif [ -x /usr/lib/java-${_javaver}-openjdk/bin/javac ]; then
+    JCONF="--with-openjdk --with-openjdk-home=/usr/lib/java-${_javaver}-openjdk" 
+    # ^ only fallback to build with broken 1.2-3, can be removed later
+  else
+    echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat"
+    return 1
+  fi
+
+  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
+	--with-xalan2-jar=/usr/share/java/xalan.jar \
+	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
+	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
+  LD_PRELOAD="" make || return 1
+  
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre
+
+  pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image
+   # Install main files.
+  cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
+  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
+
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src || return 1
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc || return 1
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
+
+   # Install man pages.
+  install -m755 -d ${pkgdir}/usr/share/man/man1
+  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ || return 1
+
+   # Install demos and samples.
+  cp -a demo ${pkgdir}/${_jvmdir}/ || return 1
+  install -m755 -d sample/rmi
+  mv bin/java-rmi.cgi sample/rmi || return 1
+  cp -a sample ${pkgdir}/${_jvmdir}/ || return 1
+  popd
+
+  # Install icons and menu entries.
+  for s in 16 24 32 48 ; do
+    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
+    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png || return 1
+  done
+
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1
+  install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
+
+  # link the mozilla-plugin
+  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+  ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
+
+  # link binaries into /usr/bin
+  install -m755 -d ${pkgdir}/usr/bin
+  pushd ${pkgdir}/${_jvmdir}/bin
+  for file in *; do
+    ln -sf ${_jvmdir}/bin/${file} \
+      ${pkgdir}/usr/bin || return 1
+  done
+  popd
+ 
+  # set some variables
+  install -m755 -d ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
+}
diff --git a/abs/extra-testing/openjdk6/aatext_by_default.diff b/abs/extra-testing/openjdk6/aatext_by_default.diff
new file mode 100644
index 0000000..268ea99
--- /dev/null
+++ b/abs/extra-testing/openjdk6/aatext_by_default.diff
@@ -0,0 +1,35 @@
+--- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old	2008-01-08 20:23:56.000000000 +0200
++++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	2008-02-24 12:39:19.000000000 +0200
+@@ -1875,7 +1875,6 @@
+      */
+     private static boolean useSystemAAFontSettings() {
+         if (!checkedSystemAAFontSettings) {
+-            useSystemAAFontSettings = true; /* initially set this true */
+             String systemAAFonts = null;
+             Toolkit tk = Toolkit.getDefaultToolkit();
+             if (tk instanceof SunToolkit) {
+@@ -1883,20 +1882,10 @@
+                     (String)AccessController.doPrivileged(
+                          new GetPropertyAction("awt.useSystemAAFontSettings"));
+             }
+-            if (systemAAFonts != null) {
+-                useSystemAAFontSettings =
+-                    Boolean.valueOf(systemAAFonts).booleanValue();
+-                /* If it is anything other than "true", then it may be
+-                 * a hint name , or it may be "off, "default", etc.
+-                 */
+-                if (!useSystemAAFontSettings) {
+-                    desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
+-                }
+-            }
+-            /* If its still true, apply the extra condition */
+-            if (useSystemAAFontSettings) {
+-                 useSystemAAFontSettings = lastExtraCondition;
+-            }
++            if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
++                systemAAFonts = "on";
++            desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
++            useSystemAAFontSettings = desktopFontHints != null;
+             checkedSystemAAFontSettings = true;
+         }
+         return useSystemAAFontSettings;
diff --git a/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff b/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff
new file mode 100644
index 0000000..8426578
--- /dev/null
+++ b/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff
@@ -0,0 +1,33 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
+@@ -86,10 +86,10 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CUT            = $(UTILS_USR_BIN_PATH)cut
++CUT            = $(UTILS_COMMAND_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+ DIFF           = $(UTILS_USR_BIN_PATH)diff
+@@ -136,7 +136,7 @@
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+ TOUCH          = $(UTILS_COMMAND_PATH)touch
+-TR             = $(UTILS_USR_BIN_PATH)tr
++TR             = $(UTILS_COMMAND_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+@@ -186,7 +186,7 @@
+   # others have it in /usr/bin.
+   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+ 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff b/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff
new file mode 100644
index 0000000..7e16e17
--- /dev/null
+++ b/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff
@@ -0,0 +1,33 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
+@@ -76,10 +76,10 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+-CUT            = $(UTILS_USR_BIN_PATH)cut
++CUT            = $(UTILS_COMMAND_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+ DIFF           = $(UTILS_USR_BIN_PATH)diff
+@@ -126,7 +126,7 @@
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+ TOUCH          = $(UTILS_COMMAND_PATH)touch
+-TR             = $(UTILS_USR_BIN_PATH)tr
++TR             = $(UTILS_COMMAND_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+@@ -173,7 +173,7 @@
+   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
+                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
+ 
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra-testing/openjdk6/fontconfig-paths.diff b/abs/extra-testing/openjdk6/fontconfig-paths.diff
new file mode 100644
index 0000000..77d3e03
--- /dev/null
+++ b/abs/extra-testing/openjdk6/fontconfig-paths.diff
@@ -0,0 +1,43 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig	2008-08-06 14:11:55.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2008-08-06 14:15:36.000000000 +0200
+@@ -128,23 +128,23 @@
+ 
+ # Font File Names
+ 
+-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
+-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
+ 
+-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
+-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
+-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
+ 
+-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
+-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
+-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
+-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
+ 
+-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
+-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
+-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf
+-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf
+-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic-subst.ttf
++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho-subst.ttf
++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/TTF/ukai.ttf
++filename.Baekmuk_Dotum=/usr/share/fonts/TTF/dotum.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
diff --git a/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff b/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff
new file mode 100644
index 0000000..0ed9209
--- /dev/null
+++ b/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff
@@ -0,0 +1,11 @@
+--- Makefile.am	2008-07-21 15:12:07.000000000 +0000
++++ Makefile.am.new	2008-07-22 08:37:49.000000000 +0000
+@@ -1176,7 +1176,7 @@
+ # gcjwebplugin.so.
+ gcjwebplugin.so: gcjwebplugin.cc
+ 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
+-	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
++	  $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \
+ 	  $(GTK_CFLAGS) $(GTK_LIBS) \
+ 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+ 	  -fpic -shared -o $@ $<
diff --git a/abs/extra-testing/openjdk6/openjdk6.install b/abs/extra-testing/openjdk6/openjdk6.install
new file mode 100644
index 0000000..3557847
--- /dev/null
+++ b/abs/extra-testing/openjdk6/openjdk6.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+
+post_remove() {
+  post_install
+}
diff --git a/abs/extra-testing/openjdk6/openjdk6.profile b/abs/extra-testing/openjdk6/openjdk6.profile
new file mode 100644
index 0000000..4af417f
--- /dev/null
+++ b/abs/extra-testing/openjdk6/openjdk6.profile
@@ -0,0 +1,4 @@
+export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
+export J2REDIR=$J2SDKDIR/jre
+export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
+#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"
diff --git a/abs/extra-testing/orbit2/PKGBUILD b/abs/extra-testing/orbit2/PKGBUILD
index e3fdf41..a8e3337 100644
--- a/abs/extra-testing/orbit2/PKGBUILD
+++ b/abs/extra-testing/orbit2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 13021 2008-09-25 19:28:50Z jgc $
+# $Id: PKGBUILD 29413 2009-03-08 16:43:13Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=orbit2
-pkgver=2.14.16
+pkgver=2.14.17
 pkgrel=1
 pkgdesc="Thin/fast CORBA ORB"
 arch=(i686 x86_64)
@@ -12,11 +12,11 @@ makedepends=('pkgconfig')
 options=('!libtool' '!makeflags')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2)
-md5sums=('f4898b999f39c79d55c13c0e0f597c71')
+md5sums=('10bfb957fa4a8935a0b4afaee7d71df7')
 
 build() {
-  cd ${startdir}/src/ORBit2-${pkgver}
+  cd "${srcdir}/ORBit2-${pkgver}"
   ./configure --prefix=/usr --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/extra-testing/printproto/PKGBUILD b/abs/extra-testing/printproto/PKGBUILD
new file mode 100644
index 0000000..11595db
--- /dev/null
+++ b/abs/extra-testing/printproto/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 567 2008-04-21 09:43:18Z alexander $
+# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+pkgname=printproto
+pkgver=1.0.4
+pkgrel=1
+pkgdesc="X11 print extension wire protocol"
+arch=(i686 x86_64)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+
+build() {
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=${startdir}/pkg install || return 1
+
+  install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
+                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+}
+md5sums=('7321847a60748b4d2f1fa16db4b6ede8')
diff --git a/abs/extra-testing/rhino/PKGBUILD b/abs/extra-testing/rhino/PKGBUILD
new file mode 100644
index 0000000..27d7c46
--- /dev/null
+++ b/abs/extra-testing/rhino/PKGBUILD
@@ -0,0 +1,18 @@
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=rhino
+pkgver=1.7R1
+pkgrel=1
+pkgdesc="Open-source implementation of JavaScript written entirely in Java"
+arch=('i686' 'x86_64')
+url="http://www.mozilla.org/rhino/"
+license=('MPL' 'GPL2')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip)
+md5sums=('613eed8201d37be201805e5048ebb0c3')
+
+build() {
+  cd ${srcdir}/rhino1_7R1
+  install -m755 -d ${pkgdir}/usr/share/java
+  install -m644 js.jar ${pkgdir}/usr/share/java/ || return 1
+}
diff --git a/abs/extra-testing/xalan-java/PKGBUILD b/abs/extra-testing/xalan-java/PKGBUILD
new file mode 100644
index 0000000..634cb23
--- /dev/null
+++ b/abs/extra-testing/xalan-java/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
+
+pkgname=xalan-java
+pkgver=2.7.1
+pkgrel=2
+pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types"
+arch=('i686' 'x86_64')
+license=('APACHE')
+url="http://xml.apache.org/xalan-j"
+depends=('xerces2-java')
+source=(http://www.apache.org/dist/xml/xalan-j/xalan-j_${pkgver//./_}-bin-2jars.tar.gz)
+md5sums=('3ccda39bcd08b780436dfd2f22fb23d5')
+
+build() {
+  cd ${srcdir}/xalan-j_${pkgver//./_}
+  install -m755 -d ${pkgdir}/usr/share/java
+  install -m644 xalan.jar ${pkgdir}/usr/share/java/ || return 1
+  install -m644 xsltc.jar ${pkgdir}/usr/share/java/ || return 1
+}
diff --git a/abs/extra-testing/xerces2-java/PKGBUILD b/abs/extra-testing/xerces2-java/PKGBUILD
new file mode 100644
index 0000000..526115d
--- /dev/null
+++ b/abs/extra-testing/xerces2-java/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xerces2-java
+pkgver=2.9.1
+pkgrel=2
+pkgdesc="High performance fully compliant Java XML parser"
+arch=('i686' 'x86_64')
+url="http://xml.apache.org/xerces2-j"
+license=('APACHE')
+provides=("java-xerces2=${pkgver}")
+conflicts=('java-xerces2')
+replaces=('java-xerces2')
+source=(http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.${pkgver}.tar.gz)
+md5sums=('32718d4cbe009f93d551ab8d3ef4b2aa')
+
+build() {
+  cd $startdir/src/xerces-${pkgver//./_}
+  install -m755 -d ${pkgdir}/usr/share/java
+  rm -f xercesSamples.jar
+  install -m644 *.jar ${pkgdir}/usr/share/java/ || return 1
+}
-- 
cgit v0.12

