Merged the gnome3 branch, this updates gnome and related pkgs to 3.0.0.

srcpkgs/GConf/GConf-devel.template

@@ -5,13 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run pkg-config
 Add_dependency run intltool
 Add_dependency run glib-devel
 Add_dependency run dbus-devel
-Add_dependency run gtk+-devel
+Add_dependency run gtk+3-devel
 Add_dependency run dbus-glib-devel
 Add_dependency run ORBit2-devel
 Add_dependency run polkit-devel
@@ -20,7 +18,7 @@ Add_dependency run GConf
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/share
+	install -d ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/{bin,share}
 	install -d ${DESTDIR}/usr/lib/gio/modules
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
@@ -31,4 +29,8 @@ do_install()
 	mv ${SRCPKGDESTDIR}/usr/lib/GConf/2/*.*a ${DESTDIR}/usr/lib/GConf/2
 	mv ${SRCPKGDESTDIR}/usr/lib/gio/modules/*.a \
 		${DESTDIR}/usr/lib/gio/modules
+
+        # Install gconf-merge-schema
+	install -m755 ${FILESDIR}/gconf-merge-schema.sh \
+		${DESTDIR}/usr/bin/gconf-merge-schema
 }

srcpkgs/GConf/files/gconf-merge-schema.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ -z "$1" -a -z "$2" ]; then
+	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 [ -n "$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"
+	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

srcpkgs/GConf/gir-gconf.template

@@ -1,13 +0,0 @@
-# Template file for 'gir-gconf'.
-#
-short_desc="Introspection data for GNOME GConf"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- GConf libraries."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/GConf/patches/01_xml-gettext-domain.patch

@@ -0,0 +1,362 @@
+# 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
+--- backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
++++ backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
+@@ -52,6 +52,7 @@ struct _MarkupEntry
+   char       *schema_name;
+   char       *mod_user;
+   GTime       mod_time;
++  const char *gettext_domain;
+ };
+ 
+ static LocalSchemaInfo* local_schema_info_new  (void);
+@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
+                              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 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
+       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 +2344,9 @@ parse_value_element (GMarkupParseContext
+   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 +2383,7 @@ parse_value_element (GMarkupParseContext
+                           "muser", &dummy2,
+                           "mtime", &dummy3,
+                           "schema", &dummy4,
++                          "gettext_domain", &dummy5,
+ 
+                           NULL))
+     return;
+@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
+       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 +2701,7 @@ parse_entry_element (GMarkupParseContext
+       mtime = NULL;
+       schema = NULL;
+       type = NULL;
++      gettext_domain = NULL;
+ 
+       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
+                               error,
+@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
+                               "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 +2778,9 @@ parse_entry_element (GMarkupParseContext
+        */
+       if (schema)
+         entry->schema_name = g_strdup (schema);
++
++      if (gettext_domain)
++        entry->gettext_domain = g_intern_string (gettext_domain);
+     }
+   else
+     {
+@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
+         GConfSchema *schema;
+         GConfValueType stype;
+         const char *owner;
++        const char *gettext_domain;
+         
+         schema = gconf_value_get_schema (value);
+ 
+@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
+             
+             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 -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
+--- doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
++++ doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
+@@ -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 -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
+--- gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
++++ gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
+@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
+   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_from_corba_schema(const Con
+         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 -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
+--- gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
++++ gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
+@@ -32,9 +32,10 @@ typedef struct {
+   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 @@ gconf_schema_free (GConfSchema* sc)
+   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 @@ gconf_schema_copy (const GConfSchema* sc
+ 
+   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 @@ gconf_schema_set_locale (GConfSchema* sc
+     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 @@ gconf_schema_set_owner (GConfSchema* sc,
+ {
+   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 @@ gconf_schema_validate (const GConfSchema
+       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,32 @@ gconf_schema_get_locale (const GConfSche
+ }
+ 
+ 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)
++    {
++      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
++      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 +350,7 @@ gconf_schema_get_long_desc (const GConfS
+ {
+   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 -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
+--- gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
++++ gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
+@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
+                                             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_list_typ
+ 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 -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
+--- gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
++++ gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
+@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
+   GConfValueType cdr_type;
+   GConfValue* global_default;
+   GHashTable* hash;
++  gchar* gettext_domain;
+ };
+ 
+ static int
+@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
+               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 @@ process_locale_info(xmlNodePtr node, Sch
+   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 @@ get_schema_from_xml(xmlNodePtr node, gch
+   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 @@ get_schema_from_xml(xmlNodePtr node, gch
+             ;  /* 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 -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
+--- gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
++++ gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
+@@ -16,6 +16,7 @@ struct ConfigSchema {
+   string short_desc;
+   string long_desc;
+   string owner;
++  string gettext_domain;
+   // Work around lack of recursive data types
+   string encoded_default_value;
+ };

srcpkgs/GConf/template

@@ -1,13 +1,12 @@
 # Template file for 'GConf'
 pkgname=GConf
-version=2.32.0
+version=2.32.2
-revision=1
 distfiles="${GNOME_SITE}/GConf/2.32/GConf-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--without-openldap --enable-gtk"
+configure_args="--without-openldap --with-gtk=3.0 --enable-defaults-service"
 short_desc="A process-transparent configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
+checksum=6bff392b9d1ca52502f0c6dac5506260800e43d72ca1fa77a4524af1a3cc1330
 long_desc="
  GConf is a process-transparent configuration database API used to
  store user preferences. It has pluggable backends and features to
@@ -15,12 +14,12 @@ long_desc="
 
 triggers="gio-modules"
 conf_files="/etc/gconf/2/path"
-subpackages="gir-gconf $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run dbus-libs
-Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run dbus-glib
 Add_dependency run ORBit2
 Add_dependency run polkit

srcpkgs/MesaLib/MesaLib-devel.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run pkg-config
 Add_dependency run glproto
 Add_dependency run dri2proto  	">=2.1"

srcpkgs/MesaLib/template

@@ -1,13 +1,13 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=7.10
+version=7.10.2
 wrksrc="Mesa-${version}"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-glx-tls --enable-xcb"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df6e0aca
+checksum=8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax

srcpkgs/NetworkManager/NetworkManager-devel.template

@@ -26,4 +26,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
 }

srcpkgs/NetworkManager/depends

@@ -1,2 +1,2 @@
-abi_depends=">=0.8"
+abi_depends=">=0.8.998"
 api_depends="${abi_depends}"

srcpkgs/NetworkManager/patches/create_dirs.patch

@@ -1,45 +0,0 @@
-From cbb0d6d116e2d5e844c2c118f2f707d10e6b6fc4 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 08 Nov 2010 15:09:54 +0000
-Subject: build: create NM state directory at install time
-
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8c01df0..d7dccaa 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -275,8 +275,10 @@ EXTRA_DIST = \
- 	$(NetworkManager_DATA)
- 
- rundir=$(localstatedir)/run/NetworkManager
-+statedir=$(localstatedir)/lib/NetworkManager
- install-data-hook:
- 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
-+	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
---
-cgit v0.8.3-6-g21f6
-From e8da63889b4124cfe3344e38b0931abf208e98da Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 08 Nov 2010 15:07:08 +0000
-Subject: keyfile: create keyfile data directory during install
-
-So distributions don't have to do it.
----
-diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
-index 1c1fd4a..c519adc 100644
---- a/system-settings/plugins/keyfile/Makefile.am
-+++ b/system-settings/plugins/keyfile/Makefile.am
-@@ -49,6 +49,8 @@ libnm_settings_plugin_keyfile_la_LIBADD = \
- 	$(DBUS_LIBS) \
- 	$(GIO_LIBS)
- 
-+keyfiledir=$(sysconfdir)/NetworkManager/system-connections
-+
- install-data-hook:
- 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
- 
---
-cgit v0.8.3-6-g21f6

srcpkgs/NetworkManager/template

@@ -1,22 +1,26 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=0.8.2
+version=0.8.998
-revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --with-distro=gentoo
---with-dhcpcd=/sbin/dhcpcd --with-dhclient=no
+--with-dhcpcd=/sbin/dhcpcd --with-dhclient=no --disable-wimax
 --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
---with-crypto=nss --disable-static"
+--with-crypto=nss --disable-static --enable-ppp"
 short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
+checksum=239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82
 long_desc="
- This packages common libraries for the GNOME desktop."
+ NetworkManager attempts to keep an active network connection available at all
+ times. It is intended only for the desktop use-case, and is not intended for
+ usage on servers. The point of NetworkManager is to make networking
+ configuration and setup as painless and automatic as possible. If using DHCP,
+ NetworkManager is _intended_ to replace default routes, obtain IP addresses
+ from a DHCP server, and change nameservers whenever it sees fit."
 
 keep_empty_dirs=yes
 openrc_services="NetworkManager default true"
-conf_files="/etc/NetworkManager/nm-system-settings.conf"
+conf_files="/etc/NetworkManager/NetworkManager.conf"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
@@ -48,19 +52,13 @@ Add_dependency build libnl-devel
 Add_dependency build polkit-devel
 Add_dependency build ppp-devel
 Add_dependency build iptables-devel
-Add_dependency build automake
 
+Add_dependency full dnsmasq
 Add_dependency full dbus		">=0"
 Add_dependency full iproute2
 Add_dependency full dhcpcd
 Add_dependency full wpa_supplicant
 
-
-pre_configure()
-{
-	cd ${wrksrc} && autoreconf -fi
-}
-
 post_install()
 {
 	# Install config file.

srcpkgs/Thunar/template

@@ -1,6 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 version=1.2.0
+revision=1
 distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Thunar File Manager"

srcpkgs/accountsservice-devel

@@ -0,0 +1 @@
+accountsservice

srcpkgs/accountsservice/accountsservice-devel.template

@@ -0,0 +1,22 @@
+# Template file for 'accountsservice-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run glib-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run polkit-devel
+Add_dependency run gobject-introspection
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
+}

srcpkgs/accountsservice/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.32.0"
+abi_depends=">=0.6.4"
 api_depends="${abi_depends}"

srcpkgs/accountsservice/template

@@ -0,0 +1,26 @@
+# Template file for 'accountsservice'
+pkgname=accountsservice
+version=0.6.7
+distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="D-Bus interfaces for querying and manipulating user account information"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=06d1d4d9875edcaec365545adb0ade792a56b8541ff968a36f47e5403cf3596d
+long_desc="
+ The accountsservice project provides a set of D-Bus interfaces for
+ querying and manipulating user account information and an implementation
+ of these interfaces, based on the useradd, usermod and userdel commands."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run polkit
+
+Add_dependency build pkg-config
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build polkit-devel
+Add_dependency build gobject-introspection

srcpkgs/alsa-plugins/template

@@ -1,6 +1,7 @@
 # Template build file for 'alsa-plugins'.
 pkgname=alsa-plugins
 version=1.0.24
+revision=1
 distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-jack --disable-maemo-plugin --with-speex=lib"
@@ -18,8 +19,9 @@ Add_dependency run glibc
 Add_dependency run alsa-lib
 Add_dependency run libpulseaudio
 Add_dependency run libspeex
-Add_dependency run ffmpeg
 Add_dependency run libsamplerate
+Add_dependency run libavcodec
+
 Add_dependency build pkg-config
 Add_dependency build alsa-lib-devel
 Add_dependency build speex-devel

srcpkgs/at-spi-devel

@@ -1 +0,0 @@
-at-spi

srcpkgs/at-spi-python

@@ -1 +0,0 @@
-at-spi

srcpkgs/at-spi/at-spi-python.template

@@ -1,17 +0,0 @@
-# Template file for 'at-spi-python'.
-#
-short_desc="${short_desc} - python extension"
-long_desc="${long_desc}
-
- This package contains ${sourcepkg} python related files."
-
-revision=1
-noarch=yes
-Add_dependency run at-spi
-Add_dependency run python
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
-}

srcpkgs/at-spi/template

@@ -1,54 +0,0 @@
-# Template file for 'at-spi'
-pkgname=at-spi
-version=1.32.0
-distfiles="${GNOME_SITE}/$pkgname/1.32/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-short_desc="Assistive Technology Service Provider Interface"
-maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039
-long_desc="
- This packages common libraries for the GNOME desktop."
-
-gconf_schemas="at-spi.schemas"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel $pkgname-python"
-
-Add_dependency run glibc
-Add_dependency run libbonobo
-Add_dependency run glib
-Add_dependency run ORBit2
-Add_dependency run atk
-Add_dependency run libX11
-Add_dependency run gtk+
-Add_dependency run pango
-Add_dependency run gdk-pixbuf
-Add_dependency run cairo
-Add_dependency run libpng
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libXtst
-Add_dependency run GConf
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libbonobo-devel
-Add_dependency build glib-devel
-Add_dependency build ORBit2-devel
-Add_dependency build atk-devel
-Add_dependency build glibc-devel
-Add_dependency build libX11-devel
-Add_dependency build gtk+-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build libXtst-devel
-Add_dependency build GConf-devel

srcpkgs/at-spi2-atk/template

@@ -0,0 +1,41 @@
+# Template file for 'at-spi2-atk'
+pkgname=at-spi2-atk
+version=2.0.0
+distfiles="${GNOME_SITE}/$pkgname/2.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1c846f1ef11485c49af8eb3850ee379ea5e775a1fc981c99291e6f5d110acc52
+long_desc="
+ This package includes a gtk-module that bridges ATK to the new D-Bus based
+ AT-SPI as well as 'C' and Python client libraries.
+
+ These libraries depend on the at-spi2-core code that contains the daemon for
+ registering applications, D-Bus helper libraries and te AT-SPI D-Bus
+ specifications."
+
+triggers="gsettings-schemas"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run atk
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build atk-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libX11-devel
+Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
+
+Add_dependency full at-spi2-core

srcpkgs/at-spi2-core-devel

@@ -0,0 +1 @@
+at-spi2-core

srcpkgs/at-spi2-core/at-spi2-core-devel.template

@@ -1,19 +1,16 @@
-# Template file for 'at-spi-devel'.
+# Template file for 'at-spi2-core-devel'.
 #
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run pkg-config
 Add_dependency run intltool
+
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/{lib,share}
-
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/{doc,idl,gtk-doc} ${DESTDIR}/usr/share
 }

srcpkgs/at-spi2-core/depends

@@ -0,0 +1,2 @@
+abi_depends=">=1.91.91"
+api_depends="${abi_depends}"

srcpkgs/at-spi2-core/template

@@ -0,0 +1,40 @@
+# Template file for 'at-spi2-core'
+pkgname=at-spi2-core
+version=2.0.0
+distfiles="${GNOME_SITE}/$pkgname/2.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="Assistive Technology Service Provider Interface"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=29bff48785301653ba8899978169f803370bc4b29f160db82d6a4410c4624389
+long_desc="
+ This package includes the protocol definitions for the new D-Bus
+ at-spi.
+
+ Also included is the daemon neccessary for forwarding device events
+ and registering accessible applicaitons."
+
+conf_files="/etc/at-spi2/accessibility.conf"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
+Add_dependency run libXtst
+Add_dependency run libXevie
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libX11-devel
+Add_dependency build libXtst-devel
+Add_dependency build libXevie-devel
+Add_dependency build gobject-introspection

srcpkgs/atk/depends

@@ -1,2 +1,2 @@
 abi_depends=">=1.26.0"
-api_depends="${abi_depends}"
+api_depends=">=1.33.6"

srcpkgs/atk/gir-atk.template

@@ -1,12 +0,0 @@
-# Template file for 'gir-atk'.
-#
-short_desc="Introspection data for ATK"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the ATK library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/atk/template

@@ -1,11 +1,11 @@
 # Template build file for 'atk'.
 pkgname=atk
-version=1.32.0
+version=2.0.0
-distfiles="${GNOME_SITE}/atk/1.32/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/atk/2.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e
+checksum=5dbdc35f7f5b3f0748039bb3faa7cd5e45ec3d337a539772bc73acd0dfb55afd
 long_desc="
  The ATK library provides a set of interfaces for accessibility.
  By supporting the ATK interfaces, an application or toolkit can
@@ -18,7 +18,7 @@ long_desc="
  It also provides interfaces which an application can use to provide
  additional accessibility information to assistive technology tools."
 
-subpackages="gir-atk atk-devel"
+subpackages="atk-devel"
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency build pkg-config

srcpkgs/avahi/avahi-discover.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains a user interface for discovering services."
 
-revision=1
-
 Add_dependency run avahi
 Add_dependency run python
 Add_dependency run avahi-python

srcpkgs/avahi/avahi-glib-libs.template

@@ -17,4 +17,5 @@ do_install()
 
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
 }

srcpkgs/avahi/avahi-python.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains utility modules to talk to Avahi with Python easier."
 
-revision=1
-
 Add_dependency run python
 Add_dependency run dbus-python
 

srcpkgs/avahi/avahi-ui-libs-devel.template

@@ -9,13 +9,14 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run avahi-libs-devel
 Add_dependency run gtk+-devel
+Add_dependency run gtk+3-devel
 Add_dependency run gdbm-devel
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/include
 
-	mv ${SRCPKGDESTDIR}/usr/include/avahi-ui ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/usr/include/avahi-ui* ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }

srcpkgs/avahi/avahi-ui-libs-gtk3.template

@@ -0,0 +1,28 @@
+# Template file for 'avahi-ui-libs-gtk3'.
+#
+short_desc="Avahi UI GTK+3 shared libraries"
+long_desc="${long_desc}
+
+ This package contains the GTK+3 UI shared libraries provided by Avahi."
+
+Add_dependency run glibc
+Add_dependency run libssp
+Add_dependency run gdbm
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run avahi-libs
+Add_dependency run avahi-glib-libs
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run gtk+3
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui-gtk3.so* ${DESTDIR}/usr/lib
+}

srcpkgs/avahi/avahi-ui-utils.template

@@ -8,7 +8,6 @@ long_desc="${long_desc}
 Add_dependency run libglade
 Add_dependency run gdk-pixbuf
 Add_dependency run libpng
-Add_dependency run gtk+
 Add_dependency run libxml2
 Add_dependency run atk
 Add_dependency run glib
@@ -23,7 +22,10 @@ Add_dependency run glibc
 Add_dependency run avahi-libs
 Add_dependency run avahi-glib-libs
 Add_dependency run avahi-ui-libs
+Add_dependency run avahi-ui-libs-gtk3
 Add_dependency run desktop-file-utils
+Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run avahi
 
 

srcpkgs/avahi/gir-avahi.template

@@ -1,12 +0,0 @@
-# Template file for 'gir-avahi'.
-#
-short_desc="Introspection data for Avahi"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for Avahi."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/avahi/template

@@ -1,17 +1,17 @@
 # Template file for 'avahi'
 pkgname=avahi
-version=0.6.28
+version=0.6.29
 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+--with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
+--with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman
+--with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman
- --disable-dbm --localstatedir=/var --disable-gtk3"
+--disable-dbm --localstatedir=/var"
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
+checksum=4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
 long_desc="
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts running on a
@@ -28,9 +28,10 @@ subpackages="$pkgname-autoipd $pkgname-discover $pkgname-compat-libs"
 subpackages="$subpackages $pkgname-compat-libs-devel $pkgname-libs"
 subpackages="$subpackages $pkgname-libs-devel $pkgname-glib-libs"
 subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs"
+subpackages="$subpackages $pkgname-ui-libs-gtk3"
 subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
-subpackages="$subpackages $pkgname-python gir-$pkgname"
+subpackages="$subpackages $pkgname-python"
 
 Add_dependency run glibc
 Add_dependency run dbus

srcpkgs/babl/gir-babl.template

@@ -1,12 +0,0 @@
-# Template file for 'gir-babl'.
-#
-short_desc="Introspection data for BABL"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the Babl library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/babl/template

@@ -1,6 +1,7 @@
 # Template build file for 'babl'.
 pkgname=babl
 version=0.1.4
+revision=1
 distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-${version}.tar.bz2"
 build_style=gnu_configure
 short_desc="Dynamic pixel format translation library"
@@ -16,6 +17,6 @@ long_desc="
  A vocabulary to formulate new pixel formats from existing primitives is
  provided as well as the framework to add new color models and data types."
 
-subpackages="gir-babl babl-devel"
+subpackages="babl-devel"
 Add_dependency run glibc
 Add_dependency build gobject-introspection

srcpkgs/boost/template

@@ -1,6 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.44.0
+revision=1
 _boostver="$(echo $version|sed 's|\.|_|g')"
 wrksrc=${pkgname}_${_boostver}
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2"

srcpkgs/brasero/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.32.1"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"

srcpkgs/brasero/gir-brasero.template

@@ -1,15 +0,0 @@
-# Template file for 'gir-brasero'.
-#
-short_desc="Brasero introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Brasero in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/brasero/template

@@ -1,12 +1,12 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=2.32.1
+version=3.0.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-compile --disable-caches --localstatedir=/var"
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
+checksum=aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3
 long_desc="
  Features
     * Data CD/DVD: supports edition of discs contents (remove/move/rename
@@ -21,54 +21,55 @@ long_desc="
 
  And much more..."
 
-subpackages="$pkgname-devel gir-$pkgname"
+subpackages="$pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 triggers="mimedb gsettings-schemas"
 
 Add_dependency run glibc
-Add_dependency run totem-pl-parser
-Add_dependency run gst-plugins-base
-Add_dependency run gstreamer
-Add_dependency run libxml2
-Add_dependency run libcanberra
-Add_dependency run gtk+
-Add_dependency run atk
 Add_dependency run glib
+Add_dependency run atk
 Add_dependency run pango
+Add_dependency run libpng
 Add_dependency run gdk-pixbuf
 Add_dependency run cairo
-Add_dependency run libpng
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run nautilus
-Add_dependency run libunique
 Add_dependency run libSM
 Add_dependency run libICE
+Add_dependency run libxml2
+Add_dependency run gtk+3
+Add_dependency run gstreamer
+Add_dependency run gst-plugins-base
+Add_dependency run totem-pl-parser
+Add_dependency run libnotify
+Add_dependency run libcanberra
+Add_dependency run nautilus
 
 Add_dependency build pkg-config
 Add_dependency build intltool
-Add_dependency build totem-pl-parser-devel
+Add_dependency build gnome-doc-utils
-Add_dependency build gst-plugins-base-devel
+Add_dependency build gobject-introspection
-Add_dependency build gstreamer-devel
-Add_dependency build libxml2-devel
-Add_dependency build libcanberra-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
 Add_dependency build glib-devel
+Add_dependency build atk-devel
 Add_dependency build pango-devel
+Add_dependency build libpng-devel
 Add_dependency build gdk-pixbuf-devel
 Add_dependency build cairo-devel
-Add_dependency build libpng-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
-Add_dependency build nautilus-devel
-Add_dependency build libunique-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
-Add_dependency build gobject-introspection
+Add_dependency build libxml2-devel
+Add_dependency build gtk+3-devel
+Add_dependency build gstreamer-devel
+Add_dependency build gst-plugins-base-devel
+Add_dependency build totem-pl-parser-devel
+Add_dependency build libnotify-devel
+Add_dependency build libcanberra-devel
+Add_dependency build nautilus-devel
 
 Add_dependency full cdrtools
-Add_dependency full dconf
+Add_dependency full dconf	">=0"
 Add_dependency full shared-mime-info
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils

srcpkgs/cantarell-fonts/INSTALL

@@ -0,0 +1,10 @@
+#
+# This script builds fontconfig's fonts cache.
+#
+case "${ACTION}" in
+post)
+	echo "Building fonts cache... "
+	fc-cache -f >/dev/null
+	echo "done."
+	;;
+esac

srcpkgs/cantarell-fonts/REMOVE

@@ -0,0 +1,10 @@
+#
+# This script builds fontconfig's fonts cache.
+#
+case "${ACTION}" in
+post)
+	echo "Building fonts cache... "
+	fc-cache -f >/dev/null
+	echo "done."
+	;;
+esac

srcpkgs/cantarell-fonts/template

@@ -0,0 +1,25 @@
+# Template file for 'cantarell-fonts'
+pkgname=cantarell-fonts
+version=0.0.6
+distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Cantarell family of TrueType fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=bf2cce939aeea3244f6786cd6b09dd40e63d65fadd5f3e37f354baf68d4d91df
+long_desc="
+ The Cantarell typeface family is a contemporary Humanist
+ sans serif, and is used by the GNOME project for its user
+ interface and the Fedora project."
+
+noarch=yes
+Add_dependency build pkg-config
+Add_dependency full fontconfig
+
+post_install()
+{
+	install -d ${DESTDIR}/etc/fonts/conf.d
+	mv ${DESTDIR}/usr/share/fontconfig/conf.avail \
+		${DESTDIR}/etc/fonts/conf.avail
+	rmdir ${DESTDIR}/usr/share/fontconfig
+	ln -s ../conf.avail/31-cantarell.conf ${DESTDIR}/etc/fonts/conf.d
+}

srcpkgs/clutter-gtk-devel

@@ -0,0 +1 @@
+clutter-gtk

srcpkgs/clutter-gtk/clutter-gtk-devel.template

@@ -0,0 +1,14 @@
+# Template file for 'clutter-gtk--devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+}

srcpkgs/clutter-gtk/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.24.2"
+abi_depends=">=0.91.8"
 api_depends="${abi_depends}"

srcpkgs/clutter-gtk/template

@@ -0,0 +1,56 @@
+# Template file for 'clutter-gtk'
+pkgname=clutter-gtk
+version=0.91.8
+distfiles="${GNOME_SITE}/$pkgname/0.91/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="GTK+ bindings for the Clutter Tolkit"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1516ac98b9f0436d7806f02153810fae31f961446311e06805f574ac1aaa969e
+long_desc="
+ This packages contains the GTK+3 bindings for the Clutter Toolkit."
+
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run json-glib
+Add_dependency run MesaLib
+Add_dependency run libdrm
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXdamage
+Add_dependency run libXcomposite
+Add_dependency run libXi
+Add_dependency run libXfixes
+Add_dependency run gtk+3
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run clutter
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build json-glib-devel
+Add_dependency build MesaLib-devel
+Add_dependency build libdrm-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXi-devel
+Add_dependency build libXfixes-devel
+Add_dependency build gtk+3-devel
+Add_dependency build atk-devel
+Add_dependency build glib-devel
+Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build libpng-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build clutter-devel

srcpkgs/clutter/gir-clutter.template

@@ -1,17 +0,0 @@
-# Template file for 'gir-clutter'.
-#
-short_desc="Clutter introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Clutter in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run clutter
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/clutter/template

@@ -1,18 +1,18 @@
 # Template file for 'clutter'
 pkgname=clutter
-version=1.6.6
+version=1.6.14
 distfiles="http://www.clutter-project.org/sources/clutter/1.6/clutter-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-x --with-flavour=glx --with-imagebackend=gdk-pixbuf
 --enable-xinput"
 short_desc="OpenGL based interactive canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=8499fef3019c00bb06354ebe6d3277d26c84a8aa1d964b7edf6d327cd4d9d886
+checksum=0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d
 long_desc="
  Clutter is an open source software library for creating fast, visually
  rich and animated graphical user interfaces."
 
-subpackages="gir-clutter clutter-devel"
+subpackages="clutter-devel"
 
 Add_dependency run glibc
 Add_dependency run glib

srcpkgs/dconf/dconf-devel.template

@@ -7,6 +7,7 @@ long_desc="${long_desc}
 
 Add_dependency run pkg-config
 Add_dependency run glib-devel
+Add_dependency run vala-devel
 Add_dependency run dconf
 
 do_install()
@@ -14,6 +15,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc,vala} \
+	mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,vala} ${DESTDIR}/usr/share
-		${DESTDIR}/usr/share
 }

srcpkgs/dconf/dconf-editor.template

@@ -15,11 +15,13 @@ Add_dependency run libpng
 Add_dependency run freetype
 Add_dependency run fontconfig
 Add_dependency run libxml2
-Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run dconf
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/bin
+	install -d ${DESTDIR}/usr/{bin,share}
 	mv ${SRCPKGDESTDIR}/usr/bin/dconf-editor ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/share/{dconf-editor,applications} \
+		${DESTDIR}/usr/share
 }

srcpkgs/dconf/gir-dconf.template

@@ -1,13 +0,0 @@
-# Template file for 'gir-dconf'.
-#
-short_desc="Introspection data for GNOME dconf"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for dconf,
- a low level configuration system."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/dconf/template

@@ -1,22 +1,24 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.5.1
+version=0.7.3
-distfiles="${GNOME_SITE}/$pkgname/0.5/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="A low-level configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
+checksum=84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9
 long_desc="
  dconf is a low-level configuration system. Its main purpose is to provide a
  backend to GSettings on platforms that don't already have configuration
  storage systems."
 
 triggers="gio-modules"
-subpackages="gir-dconf dconf-devel dconf-editor"
+subpackages="dconf-devel dconf-editor"
 
 Add_dependency run glibc
 Add_dependency run glib
+Add_dependency run dbus-libs
 Add_dependency build pkg-config
 Add_dependency build glib-devel
 Add_dependency build gtk+-devel
+Add_dependency build vala-devel
 Add_dependency full dbus

srcpkgs/dejavu-fonts-ttf/template

@@ -1,11 +1,11 @@
 # Template file for 'dejavu-fonts-ttf'
 pkgname=dejavu-fonts-ttf
-version=2.29
+version=2.33
 distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
 build_style=custom-install
 short_desc="DejaVu family of TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a09f2c14fca1e5908d61ce37997aaaef8b0a1b46c01a8b0834ca6873dc398ad6
+checksum=82a5823a270715913af51915cc20594568f57afb7450abb989695d8808a4194d
 long_desc="
  DejaVu is a family of fonts derived from the Bitstream Vera family.
  It provides a wider range of characters than the original. These

srcpkgs/dhcpcd-dbus/template

@@ -1,6 +1,7 @@
 # Template file for 'dhcpcd-dbus'
 pkgname=dhcpcd-dbus
 version=0.4.2
+revision=1
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$version.tar.bz2"
 build_style=gnu_makefile
 short_desc="dhcpcd D-Bus interface"
@@ -10,7 +11,9 @@ long_desc="
  dhcpcd-dbus is the dhcpcd D-Bus interface, receives interface configuration
  events from the dhcpcd control socket and emits them to the DBus listeners."
 
+Add_dependency run glibc
+Add_dependency run dbus-libs
 Add_dependency build pkg-config
-Add_dependency full glibc
+Add_dependency build dbus-devel
 Add_dependency full dhcpcd
 Add_dependency full dbus

srcpkgs/dhcpcd-gtk/template

@@ -1,6 +1,7 @@
 # Template file for 'dhcpcd-gtk'
 pkgname=dhcpcd-gtk
 version=0.4.2
+revision=1
 wrksrc=dhcpcd-ui-${version}
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2"
 build_style=gnu_makefile
@@ -20,9 +21,11 @@ long_desc="
  to, if they're encrypted or not and their overall quality. You can click
  on one to configure the PSK or WEP key 0 for it."
 
+Add_dependency run glibc
+Add_dependency run gtk+
+Add_dependency run libnotify
 Add_dependency build pkg-config
-Add_dependency full glibc
+Add_dependency build gtk+-devel
+Add_dependency build libnotify-devel
 Add_dependency full dhcpcd
 Add_dependency full dhcpcd-dbus
-Add_dependency full gtk+
-Add_dependency full libnotify

srcpkgs/empathy/template

@@ -0,0 +1,133 @@
+# Template file for 'empathy'
+pkgname=empathy
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-scrollkeeper --disable-schemas-compile
+--disable-static"
+short_desc="GNOME instant messaging client using the Telepathy framework"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=e409d764805a4501f8c9efa44ffb1a398820d6928b825932baa5447bc628ed5c
+long_desc="
+ Instant messaging program supporting text, voice, video, file transfers and
+ inter-application communication over many different protocols, including:
+ AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, Gadu-Gadu,
+ Groupwise, ICQ and QQ."
+
+triggers="gsettings-schemas"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency run glibc
+Add_dependency run evolution-data-server
+Add_dependency run enchant
+Add_dependency run geoclue
+Add_dependency run NetworkManager
+Add_dependency run dbus-glib
+Add_dependency run folks
+Add_dependency run libgnome-keyring
+Add_dependency run gnutls
+Add_dependency run telepathy-logger
+Add_dependency run telepathy-glib
+Add_dependency run libxml2
+Add_dependency run libcanberra
+Add_dependency run libnotify
+Add_dependency run clutter-gtk
+Add_dependency run libchamplain
+Add_dependency run clutter
+Add_dependency run libX11
+Add_dependency run webkit-gtk3
+Add_dependency run gtk+3
+Add_dependency run gdk-pixbuf
+Add_dependency run pango
+Add_dependency run glib
+Add_dependency run gnome-keyring
+Add_dependency run farsight2
+Add_dependency run telepathy-farsight
+Add_dependency run gst-plugins-base
+Add_dependency run gstreamer
+Add_dependency run gnome-control-center
+Add_dependency run nspr
+Add_dependency run nss
+Add_dependency run sqlite
+Add_dependency run GConf
+Add_dependency run dbus-libs
+Add_dependency run libgee
+Add_dependency run libtasn1
+Add_dependency run json-glib
+Add_dependency run MesaLib
+Add_dependency run libdrm
+Add_dependency run libXext
+Add_dependency run libXdamage
+Add_dependency run libXcomposite
+Add_dependency run libXi
+Add_dependency run libXfixes
+Add_dependency run libsoup
+Add_dependency run atk
+Add_dependency run libpng
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run nautilus-sendto
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build evolution-data-server-devel
+Add_dependency build enchant-devel
+Add_dependency build geoclue-devel
+Add_dependency build NetworkManager-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build folks-devel
+Add_dependency build libgnome-keyring-devel
+Add_dependency build gnutls-devel
+Add_dependency build telepathy-logger-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build libcanberra-devel
+Add_dependency build libnotify-devel
+Add_dependency build clutter-gtk-devel
+Add_dependency build libchamplain-devel
+Add_dependency build clutter-devel
+Add_dependency build libX11-devel
+Add_dependency build webkit-gtk3-devel
+Add_dependency build gtk+3-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build pango-devel
+Add_dependency build glib-devel
+Add_dependency build gnome-keyring-devel
+Add_dependency build farsight2-devel
+Add_dependency build telepathy-farsight-devel
+Add_dependency build gst-plugins-base-devel
+Add_dependency build gstreamer-devel
+Add_dependency build gnome-control-center-devel
+Add_dependency build nspr-devel
+Add_dependency build nss-devel
+Add_dependency build sqlite-devel
+Add_dependency build GConf-devel
+Add_dependency build dbus-devel
+Add_dependency build libgee-devel
+Add_dependency build libtasn1-devel
+Add_dependency build json-glib-devel
+Add_dependency build MesaLib-devel
+Add_dependency build libdrm-devel
+Add_dependency build libXext-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXi-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libsoup-devel
+Add_dependency build atk-devel
+Add_dependency build libpng-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build nautilus-sendto-devel
+
+Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
+
+# XXX add telepathy-{salut,sofiasip,haze}
+Add_dependency full telepathy-butterfly
+Add_dependency full telepathy-gabble
+Add_dependency full telepathy-idle
+Add_dependency full telepathy-mission-control

srcpkgs/eog/eog-devel.template

@@ -8,27 +8,31 @@ long_desc="${long_desc}
 Add_dependency run pkg-config
 Add_dependency run intltool
 Add_dependency run gnome-doc-utils
+Add_dependency run which
 Add_dependency run gnome-desktop-devel
-Add_dependency run startup-notification-devel
+Add_dependency run libpeas-devel
-Add_dependency run GConf-devel
+Add_dependency run gtk+3-devel
-Add_dependency run gtk+-devel
 Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
 Add_dependency run libexif-devel
 Add_dependency run lcms-devel
 Add_dependency run exempi-devel
 Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
+Add_dependency run librsvg-devel
-Add_dependency run zlib-devel
+Add_dependency run glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run cairo-devel
 Add_dependency run jpeg-devel
 Add_dependency run libxml2-devel
 Add_dependency run libX11-devel
-Add_dependency run librsvg-devel
+Add_dependency run libgirepository-devel
-Add_dependency run pygtk-devel
+Add_dependency run zlib-devel
+Add_dependency run startup-notification-devel
+Add_dependency run pango-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libffi-devel
+Add_dependency run dbus-devel
+Add_dependency run libpng-devel
 
 do_install()
 {
@@ -36,4 +40,5 @@ do_install()
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}//usr/share/eog/gir-1.0 ${DESTDIR}/usr/share
 }

srcpkgs/eog/template

@@ -1,74 +1,76 @@
 # Template file for 'eog'
 pkgname=eog
-version=2.32.1
+version=3.0.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/eog/3.0/eog-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
+configure_args="--disable-scrollkeeper --localstatedir=/var"
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---disable-scrollkeeper"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078
+checksum=785ee969dbd17c52b2b18c42464247703fa9511d84381e88c81830d7ac7f24a7
 long_desc="
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
  which uses the gdk-pixbuf library. It can deal with large images, and zoom
  and scroll with constant memory usage. Its goals are simplicity and
  standards compliance."
 
-gconf_schemas="eog.schemas"
+triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+subpackages="eog-devel"
 
 Add_dependency run glibc
 Add_dependency run gnome-desktop
-Add_dependency run startup-notification
+Add_dependency run libpeas
-Add_dependency run GConf
+Add_dependency run gtk+3
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
 Add_dependency run atk
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
 Add_dependency run libexif
 Add_dependency run lcms
 Add_dependency run exempi
 Add_dependency run dbus-glib
-Add_dependency run dbus-libs
+Add_dependency run librsvg
-Add_dependency run zlib
+Add_dependency run glib
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
 Add_dependency run jpeg
 Add_dependency run libxml2
 Add_dependency run libX11
-Add_dependency run librsvg
+Add_dependency run libgirepository
+Add_dependency run zlib
+Add_dependency run startup-notification
+Add_dependency run pango
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libffi
+Add_dependency run dbus-libs
+Add_dependency run libpng
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
+Add_dependency build which
 Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
+Add_dependency build libpeas-devel
-Add_dependency build GConf-devel
+Add_dependency build gtk+3-devel
-Add_dependency build gtk+-devel
 Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
 Add_dependency build libexif-devel
 Add_dependency build lcms-devel
 Add_dependency build exempi-devel
 Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
+Add_dependency build librsvg-devel
-Add_dependency build zlib-devel
+Add_dependency build glib-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
 Add_dependency build jpeg-devel
 Add_dependency build libxml2-devel
 Add_dependency build libX11-devel
-Add_dependency build pygtk-devel
+Add_dependency build libgirepository-devel
-Add_dependency build librsvg-devel
+Add_dependency build zlib-devel
-Add_dependency build which
+Add_dependency build startup-notification-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libffi-devel
+Add_dependency build dbus-devel
+Add_dependency build libpng-devel
 
-Add_dependency full gnome-icon-theme
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils

srcpkgs/epiphany/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"

srcpkgs/epiphany/epiphany-devel.template

@@ -8,37 +8,35 @@ long_desc="${long_desc}
 Add_dependency run pkg-config
 Add_dependency run intltool
 Add_dependency run gnome-doc-utils
-Add_dependency run avahi-glib-libs-devel
+Add_dependency run gobject-introspection
+Add_dependency run glib-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run nspr-devel
+Add_dependency run nss-devel
 Add_dependency run avahi-libs-devel
-Add_dependency run libX11-devel
+Add_dependency run avahi-glib-libs-devel
 Add_dependency run libSM-devel
 Add_dependency run libICE-devel
+Add_dependency run libX11-devel
 Add_dependency run libxslt-devel
-Add_dependency run zlib-devel
-Add_dependency run libxml2-devel
-Add_dependency run GConf-devel
-Add_dependency run startup-notification-devel
-Add_dependency run libnotify-devel
-Add_dependency run webkit-gtk-devel
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
 Add_dependency run pango-devel
+Add_dependency run gdk-pixbuf-devel
 Add_dependency run cairo-devel
-Add_dependency run freetype-devel
+Add_dependency run gtk+3-devel
-Add_dependency run fontconfig-devel
+Add_dependency run libxml2-devel
-Add_dependency run libsoup-gnome-devel
-Add_dependency run libsoup-devel
-Add_dependency run glib-devel
 Add_dependency run libgnome-keyring-devel
-Add_dependency run dbus-glib-devel
+Add_dependency run libsoup-devel
-Add_dependency run dbus-devel
+Add_dependency run libsoup-gnome-devel
-Add_dependency run nss-devel
+Add_dependency run libgirepository-devel
-Add_dependency run nspr-devel
+Add_dependency run webkit-gtk3-devel
+Add_dependency run glade3-devel
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{aclocal,gtk-doc} ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/{aclocal,gir*} \
+		${DESTDIR}/usr/share
 }

srcpkgs/epiphany/gir-epiphany.template

@@ -1,13 +0,0 @@
-# Template file for 'gir-epiphany'.
-#
-short_desc="Introspection data for GNOME Epiphany"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- Epiphany library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/epiphany/template

@@ -1,14 +1,13 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=2.30.6
+version=3.0.0
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
+configure_args="--disable-schemas-compile --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-introspection
 --localstatedir=/var --enable-network-manager --without-ca-file"
 short_desc="Intuitive GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
+checksum=9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb
 long_desc="
  Epiphany is a simple yet powerful GNOME web browser targeted at non-technical
  users. Its principles are simplicity and standards compliance. Simplicity is
@@ -19,83 +18,62 @@ long_desc="
  by closely following the GNOME Human Interface Guidelines (HIG) and by close
  integration with the GNOME desktop."
 
-gconf_schemas="epiphany.schemas epiphany-lockdown.schemas"
+triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
-# XXX: enable introspection support when it's fixed.
 # XXX: enable --with-ca-file.
 
 Add_dependency run glibc
-Add_dependency run avahi-glib-libs
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run nspr
+Add_dependency run nss
 Add_dependency run avahi-libs
-Add_dependency run libX11
+Add_dependency run avahi-glib-libs
 Add_dependency run libSM
 Add_dependency run libICE
+Add_dependency run libX11
 Add_dependency run libxslt
-Add_dependency run zlib
-Add_dependency run libxml2
-Add_dependency run GConf
-Add_dependency run startup-notification
-Add_dependency run libnotify
-Add_dependency run webkit-gtk
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run atk
 Add_dependency run pango
+Add_dependency run gdk-pixbuf
 Add_dependency run cairo
-Add_dependency run freetype
+Add_dependency run gtk+3
-Add_dependency run fontconfig
+Add_dependency run libxml2
-Add_dependency run libsoup-gnome
-Add_dependency run libsoup
-Add_dependency run glib
 Add_dependency run libgnome-keyring
-Add_dependency run dbus-glib
+Add_dependency run libsoup
-Add_dependency run dbus-libs
+Add_dependency run libsoup-gnome
-Add_dependency run nss
+Add_dependency run libgirepository
-Add_dependency run nspr
+Add_dependency run webkit-gtk3
-Add_dependency run NetworkManager
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
-Add_dependency build avahi-glib-libs-devel
+Add_dependency build gobject-introspection
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build nspr-devel
+Add_dependency build nss-devel
 Add_dependency build avahi-libs-devel
-Add_dependency build libX11-devel
+Add_dependency build avahi-glib-libs-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
+Add_dependency build libX11-devel
 Add_dependency build libxslt-devel
-Add_dependency build zlib-devel
-Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libnotify-devel
-Add_dependency build webkit-gtk-devel			">=1.2.5"
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
 Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
 Add_dependency build cairo-devel
-Add_dependency build freetype-devel
+Add_dependency build gtk+3-devel
-Add_dependency build fontconfig-devel
+Add_dependency build libxml2-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libsoup-devel
-Add_dependency build glib-devel
 Add_dependency build libgnome-keyring-devel
-Add_dependency build dbus-glib-devel
+Add_dependency build libsoup-devel
-Add_dependency build dbus-devel
+Add_dependency build libsoup-gnome-devel
-Add_dependency build nss-devel
+Add_dependency build libgirepository-devel
-Add_dependency build nspr-devel
+Add_dependency build webkit-gtk3-devel
-Add_dependency build NetworkManager-devel
+Add_dependency build glade3-devel
-#Add_dependency build gobject-introspection
 
+Add_dependency full NetworkManager
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
-
-pre_configure()
-{
-	# Don't use cmp from busybox.
-	for f in $(find ${wrksrc} -type f -name Makefile.in); do
-		sed -i "s|cmp -s|/usr/bin/cmp -s|g" ${f} || return 1
-	done
-}

srcpkgs/evolution-data-server/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.32.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"

srcpkgs/evolution-data-server/evolution-data-server-devel.template

@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -10,26 +10,29 @@ Add_dependency run intltool
 Add_dependency run gperf
 Add_dependency run glib-devel
 Add_dependency run zlib-devel
-Add_dependency run libsoup-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
 Add_dependency run libxml2-devel
 Add_dependency run sqlite-devel
 Add_dependency run mit-krb5-devel
 Add_dependency run e2fsprogs-devel
 Add_dependency run nss-devel
 Add_dependency run nspr-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run GConf-devel
-Add_dependency run gtk+-devel
 Add_dependency run atk-devel
 Add_dependency run pango-devel
 Add_dependency run cairo-devel
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gtk+3-devel
+Add_dependency run GConf-devel
+Add_dependency run libsoup-devel
 Add_dependency run libgnome-keyring-devel
 Add_dependency run db-devel
 Add_dependency run libical-devel
 Add_dependency run libgweather-devel
+Add_dependency run libldap-devel
+Add_dependency run libgdata-devel
 Add_dependency run evolution-data-server
 
 do_install()
@@ -37,5 +40,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
 }

srcpkgs/evolution-data-server/template

@@ -1,34 +1,34 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=2.32.1
+version=3.0.0
-revision=1
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--localstatedir=/var --enable-gnome-keyring
+configure_args="--localstatedir=/var --with-openldap
 --enable-ssl --enable-smime --enable-ipv6=yes --enable-calendar=yes
 --enable-largefile --disable-schemas-install --with-libdb=/usr
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
---with-nss-includes=/usr/include/nss --with-openldap"
+--with-nss-includes=/usr/include/nss"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=de6a724504a9d72ca550a5a157df1e27dbb951a673f281106171c2345912fc79
+checksum=2fa5d11dffa18e7161db35237aed46476a58e20ef895f74455f01e36484c063f
 long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."
 
 subpackages="$pkgname-devel"
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run glib
 Add_dependency run libxml2
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
 Add_dependency run sqlite
 Add_dependency run mit-krb5-libs
 Add_dependency run e2fsprogs-libs
 Add_dependency run nss
 Add_dependency run nspr
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
 Add_dependency run atk
 Add_dependency run pango
 Add_dependency run cairo
@@ -36,38 +36,38 @@ Add_dependency run freetype
 Add_dependency run fontconfig
 Add_dependency run libpng
 Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run libdb
 Add_dependency run libldap
 Add_dependency run libical
 Add_dependency run libsoup
 Add_dependency run libgnome-keyring
 Add_dependency run libgweather
-Add_dependency run GConf
 Add_dependency run libgdata
+Add_dependency run GConf
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gperf
 Add_dependency build glib-devel
 Add_dependency build zlib-devel
-Add_dependency build libsoup-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
 Add_dependency build libxml2-devel
 Add_dependency build sqlite-devel
 Add_dependency build mit-krb5-devel
 Add_dependency build e2fsprogs-devel
 Add_dependency build nss-devel
 Add_dependency build nspr-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build GConf-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
 Add_dependency build atk-devel
 Add_dependency build pango-devel
 Add_dependency build cairo-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+3-devel
+Add_dependency build GConf-devel
+Add_dependency build libsoup-devel
 Add_dependency build libgnome-keyring-devel
 Add_dependency build db-devel
 Add_dependency build libical-devel

srcpkgs/farsight2-devel

@@ -0,0 +1 @@
+farsight2

srcpkgs/farsight2/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.24.3"
+abi_depends=">=0.0.26"
 api_depends="${abi_depends}"

srcpkgs/farsight2/farsight2-devel.template

@@ -0,0 +1,28 @@
+# Template file for 'farsight2-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run glib-devel
+Add_dependency run python-devel
+Add_dependency run libxml2-devel
+Add_dependency run gstreamer-devel
+Add_dependency run gst-plugins-base-devel
+Add_dependency run libnice-devel
+Add_dependency run libsoup-devel
+Add_dependency run gssdp-devel
+Add_dependency run gupnp-devel
+Add_dependency run gupnp-igd-devel
+Add_dependency run farsight2
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}

srcpkgs/farsight2/template

@@ -0,0 +1,46 @@
+# Template file for 'farsight2'
+pkgname=farsight2
+version=0.0.26
+distfiles="http://farsight.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-valgrind --disable-debug --disable-static
+--with-package-origin=XBPS"
+short_desc="Audio/Video conference software for Instant Messengers"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=b554e20b24e03c84073ae17dd525217e230954ec84506f08b67a11a054c7ea39
+long_desc="
+ The Farsight project is an effort to create a framework to deal with all
+ known audio/video conferencing protocols. On one side it offers a generic API
+ that makes it possible to write plugins for different streaming protocols, on
+ the other side it offers an API for clients to use those plugins."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run gstreamer
+Add_dependency run gst-plugins-base
+Add_dependency run libnice
+Add_dependency run libsoup
+Add_dependency run gssdp
+Add_dependency run gupnp
+Add_dependency run gupnp-igd
+Add_dependency run python
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build python-devel
+Add_dependency build libxml2-devel
+Add_dependency build gstreamer-devel
+Add_dependency build gst-plugins-base-devel
+Add_dependency build libnice-devel
+Add_dependency build libsoup-devel
+Add_dependency build gssdp-devel
+Add_dependency build gupnp-devel
+Add_dependency build gupnp-igd-devel
+
+Add_dependency full pygobject
+Add_dependency full gst-python
+Add_dependency full gst-plugins-good
+Add_dependency full gst-plugins-bad

srcpkgs/ffmpeg/depends

@@ -1,2 +1,2 @@
-abi_depends=">=0.5.1"
+abi_depends=">=0.6"
 api_depends="${abi_depends}"

srcpkgs/ffmpeg/ffmpeg-devel.template

@@ -1,12 +1,10 @@
 # Template file for 'ffmpeg-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run pkg-config
 Add_dependency run glibc-devel
 Add_dependency run SDL-devel

srcpkgs/ffmpeg/libavcodec.template

@@ -0,0 +1,25 @@
+# Template file for 'libavcodec'.
+#
+short_desc="FFmpeg codec library"
+long_desc="
+ This is the codec library from FFmpeg (both encoding and decoding).
+
+ It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...)."
+
+Add_dependency run zlib
+Add_dependency run glibc
+Add_dependency run faac
+Add_dependency run faad2
+Add_dependency run lame
+Add_dependency run libtheora
+Add_dependency run libvorbis
+Add_dependency run x264
+Add_dependency run xvidcore
+Add_dependency run libvpx
+Add_dependency run libavutil
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavcodec.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/libavdevice.template

@@ -0,0 +1,20 @@
+# Template file for 'libavdevice'.
+#
+short_desc="FFmpeg device handling library"
+long_desc="
+ This is the device handling library from FFmpeg."
+
+Add_dependency run libavformat
+Add_dependency run libavcodec
+Add_dependency run libavutil
+Add_dependency run alsa-lib
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavdevice.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/libavformat.template

@@ -0,0 +1,19 @@
+# Template file for 'libavformat'.
+#
+short_desc="FFmpeg file format library"
+long_desc="
+ This is the library for handling file formats from FFmpeg.
+
+ It supports most existing file formats (AVI, MPEG, OGG, Matroska, ASF...)."
+
+Add_dependency run libavcodec
+Add_dependency run libavutil
+Add_dependency run zlib
+Add_dependency run bzip2
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavformat.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/libavutil.template

@@ -0,0 +1,14 @@
+# Template file for 'libavutil'.
+#
+short_desc="FFmpeg utility library"
+long_desc="
+ This is the common utility library from FFmpeg. It contains shared code used
+ by all other ffmpeg libraries."
+
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavutil.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/libpostproc.template

@@ -0,0 +1,14 @@
+# Template file for 'libpostproc'.
+#
+short_desc="FFmpeg video postprocessing library"
+long_desc="
+ This is the video postprocessing library from FFmpeg."
+
+Add_dependency run libavutil
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpostproc.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/libswscale.template

@@ -0,0 +1,14 @@
+# Template file for 'libswscale'.
+#
+short_desc="FFmpeg video scaling library"
+long_desc="
+ This is the video software scaling library from FFmpeg."
+
+Add_dependency run libavutil
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libswscale.so* ${DESTDIR}/usr/lib
+}

srcpkgs/ffmpeg/template

@@ -1,19 +1,11 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=0.5.1
+version=0.6
-revision=2
+distfiles="http://ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"
-distfiles="http://launchpad.net/ffmpeg/0.5/$version/+download/ffmpeg-${version}.tar.bz2"
+build_style=custom-install
-build_style=configure
-configure_args="--prefix=/usr --enable-gpl --enable-libmp3lame
---enable-libvorbis --enable-libfaac --enable-libfaad --enable-libxvid
---enable-libx264 --enable-libtheora --enable-postproc --enable-shared
---enable-pthreads --enable-x11grab --enable-version3 --enable-nonfree
---enable-swscale"
-make_build_target="doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1 all"
-make_install_args="install-man"
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c2be7188db2083ca8cbadfc240a8776a39abb2357b0ae10e26530eef61a4c858
+checksum=6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120
 long_desc="
  FFmpeg is the first complete and free Internet Live Audio and Video
  Broadcasting solution. FFMpeg aims at being the command line tool to
@@ -26,12 +18,19 @@ long_desc="
  FFmpeg generates streaming files, in many popular formats
  simultaneously, faster than any other solution."
 
-subpackages="$pkgname-devel"
+subpackages="libavcodec libavdevice libavformat libavutil"
+subpackages="${subpackages} libpostproc libswscale $pkgname-devel"
 
 Add_dependency run glibc
-Add_dependency run freetype
+Add_dependency run libavformat
-Add_dependency run SDL
+Add_dependency run libavcodec
+Add_dependency run libavutil
+Add_dependency run alsa-lib
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXfixes
 Add_dependency run zlib
+Add_dependency run bzip2
 Add_dependency run faac
 Add_dependency run faad2
 Add_dependency run lame
@@ -39,16 +38,21 @@ Add_dependency run libtheora
 Add_dependency run libvorbis
 Add_dependency run x264
 Add_dependency run xvidcore
-Add_dependency run bzip2
+Add_dependency run libavdevice
-Add_dependency run alsa-lib
+Add_dependency run libpostproc
-Add_dependency run libX11
+Add_dependency run libswscale
-Add_dependency run libXext
+Add_dependency run SDL
+Add_dependency run libvpx
 
 Add_dependency build pkg-config
-Add_dependency build glibc-devel
+Add_dependency build perl	">=0"
-Add_dependency build freetype-devel
+Add_dependency build yasm
-Add_dependency build SDL-devel
+Add_dependency build alsa-lib-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
 Add_dependency build zlib-devel
+Add_dependency build bzip2-devel
 Add_dependency build faac-devel
 Add_dependency build faad2-devel
 Add_dependency build lame-devel
@@ -56,7 +60,39 @@ Add_dependency build libtheora-devel
 Add_dependency build libvorbis-devel
 Add_dependency build x264-devel
 Add_dependency build xvidcore-devel
-Add_dependency build bzip2-devel
+Add_dependency build SDL-devel
-Add_dependency build alsa-lib-devel
+Add_dependency build libvpx-devel
-Add_dependency build libX11-devel
+
-Add_dependency build libXext-devel
+do_build()
+{
+	./configure \
+		--prefix=/usr \
+		--enable-gpl \
+		--enable-libmp3lame \
+		--enable-libvorbis \
+		--enable-libfaac \
+		--enable-libxvid \
+		--enable-libx264 \
+		--enable-libvpx \
+		--enable-libtheora \
+		--enable-postproc \
+		--enable-shared \
+		--enable-x11grab \
+		--disable-libopencore_amrnb \
+		--disable-libopencore_amrwb \
+		--disable-libschroedinger \
+		--disable-libopenjpeg \
+		--enable-version3 \
+		--enable-nonfree \
+		--enable-runtime-cpudetect \
+		--disable-debug  # libfaac is nonfree
+
+	sed -i -e "s|pod2man|/usr/lib/perl5/core_perl/bin/pod2man|g" Makefile
+	make ${makejobs}
+	make doc/ff{mpeg,play,server}.1
+}
+
+do_install()
+{
+	make DESTDIR=${DESTDIR} install install-man
+}

srcpkgs/file-roller/template

@@ -1,14 +1,13 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=2.32.1
+version=3.0.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--localstatedir=/var --disable-schemas-install
+configure_args="--localstatedir=/var --disable-scrollkeeper --enable-magic
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
+--disable-schemas-compile --disable-static"
---disable-scrollkeeper"
 short_desc="GNOME Front-end to archiving programs like tar and zip"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a9109d9c871c022eb0553eeedc98520bad42ba3099088c16a9f7df817f60cc92
+checksum=0c294d34493fc67577f70f73ada455f77634857e904b1dcaded59e3dcd092f8e
 long_desc="
  File Roller is an archive manager for the GNOME environment. This means
  that you can:
@@ -31,11 +30,12 @@ long_desc="
   - arj: ARJ archiver
   - unace: extraction tool for the proprietary ace archive format"
 
-gconf_schemas="$pkgname.schemas"
+triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
 Add_dependency run glib
+Add_dependency run file
 Add_dependency run gdk-pixbuf
 Add_dependency run pango
 Add_dependency run atk
@@ -43,25 +43,25 @@ Add_dependency run cairo
 Add_dependency run libpng
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run gtk+
+Add_dependency run gtk+3
 Add_dependency run GConf
 Add_dependency run nautilus
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
-Add_dependency build gtk+-devel
+Add_dependency build file-devel
 Add_dependency build glib-devel
 Add_dependency build gdk-pixbuf-devel
 Add_dependency build pango-devel
-Add_dependency build GConf-devel
-Add_dependency build glibc-devel
-Add_dependency build nautilus-devel
 Add_dependency build atk-devel
 Add_dependency build cairo-devel
 Add_dependency build libpng-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
+Add_dependency build gtk+3-devel
+Add_dependency build GConf-devel
+Add_dependency build nautilus-devel
 
 Add_dependency full desktop-file-utils
 Add_dependency full hicolor-icon-theme

srcpkgs/firefox/template

@@ -1,6 +1,6 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=3.6.13
+version=3.6.15
 _libxul_sdkver=1.9.2
 wrksrc=mozilla-${_libxul_sdkver}
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
@@ -16,7 +16,7 @@ configure_args="--enable-application=browser --enable-default-toolkit=cairo-gtk2
 --with-libxul-sdk=/usr/lib/xulrunner-devel-${_libxul_sdkver}"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63
+checksum=405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f
 long_desc="
  Mozilla Firefox is a free, open-source and cross-platform web browser
  for Windows, Linux, MacOS X and many other operating systems. It is
@@ -47,10 +47,10 @@ Add_dependency build gtk+-devel
 
 post_install()
 {
-	install -d ${DESTDIR}/usr/share/applications || return 1
+	install -d ${DESTDIR}/usr/share/applications
-	install -d ${DESTDIR}/usr/share/pixmaps || return 1
+	install -d ${DESTDIR}/usr/share/pixmaps
 	install -m644 ${FILESDIR}/*.desktop \
-		${DESTDIR}/usr/share/applications || return 1
+		${DESTDIR}/usr/share/applications
 	install -m644 ${wrksrc}/browser/branding/unofficial/default48.png \
-		${DESTDIR}/usr/share/pixmaps/firefox.png || return 1
+		${DESTDIR}/usr/share/pixmaps/firefox.png
 }

srcpkgs/folks-devel

@@ -0,0 +1 @@
+folks

srcpkgs/folks/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.24.3"
+abi_depends=">=0.4.0"
 api_depends="${abi_depends}"

srcpkgs/folks/folks-devel.template

@@ -0,0 +1,26 @@
+# Template file for 'folks-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run glib-devel
+Add_dependency run vala-devel
+Add_dependency run readline-devel
+Add_dependency run libxml2-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run telepathy-glib-devel
+Add_dependency run libgee-devel
+Add_dependency run folks
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/vala ${DESTDIR}/usr/share
+}

srcpkgs/folks/template

@@ -0,0 +1,36 @@
+# Template file for 'folks'
+pkgname=folks
+version=0.4.2
+distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--enable-vala"
+short_desc="GObject Library to aggregate people into metacontacts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=269426df3896c07581067d3ead6aa2669c5895cfd3568e9e83abda5016b08e54
+long_desc="
+ libfolks is a library that aggregates people from multiple sources (eg,
+ Telepathy connection managers and eventually evolution data server, Facebook,
+ etc.) to create metacontacts. It's written in Vala (in part to evaluate Vala).
+ The initial goal is for GObject/C support, though the Vala bindings should
+ basically automatic."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run readline
+Add_dependency run libxml2
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run telepathy-glib
+Add_dependency run libgee
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build vala-devel
+Add_dependency build readline-devel
+Add_dependency build libxml2-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build libgee-devel

srcpkgs/gcalctool/template

@@ -0,0 +1,30 @@
+# Template file for 'gcalctool'
+pkgname=gcalctool
+version=6.0.0
+distfiles="${GNOME_SITE}/$pkgname/6.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="GNOME Scientific calculator"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=efada505801df4fc046ef22e9786d9ba535935d07e87f45f5a10f7624836c036
+long_desc="
+ The package contains the GNOME scientific calculator."
+
+triggers="gsettings-schemas"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run libxml2
+Add_dependency run gtk+3
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build glib-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build libxml2-devel
+Add_dependency build gtk+3-devel
+
+Add_dependency full desktop-file-utils

srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template

@@ -6,7 +6,6 @@ long_desc="
 
  This package contains development files: headers, static libs, etc."
 
-revision=1
 replaces="gtk+-devel<2.22"
 
 Add_dependency run glibc

srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template

@@ -1,13 +0,0 @@
-# Template file for 'gir-gdk-pixbuf'.
-#
-short_desc="Introspection data for GdkPixbuf"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GDK
- pixbuf library."
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}

srcpkgs/gdk-pixbuf/template

@@ -1,19 +1,19 @@
 # Template build file for 'gdk-pixbuf'.
 pkgname=gdk-pixbuf
-version=2.22.1
+version=2.23.1
-distfiles="${GNOME_SITE}/$pkgname/2.22/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/2.23/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--without-libjasper --with-included-loaders=png"
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
+checksum=3961d293bc2fa01c1d55cc2970e2d6f465ad67f9c0de56e9e189744a9462bba4
 long_desc="
  This package contains an image loading library for the GTK+ toolkit v2."
 
 # gtk+<2.22 included gdk-pixbuf.
 replaces="gtk+<2.22"
 triggers="gtk-pixbuf-loaders"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
@@ -21,6 +21,7 @@ Add_dependency run libpng
 Add_dependency run jpeg
 Add_dependency run tiff
 Add_dependency run libX11
+
 Add_dependency build perl
 Add_dependency build pkg-config
 Add_dependency build glib-devel

srcpkgs/gdm/INSTALL

@@ -3,7 +3,12 @@
 #
 case "${ACTION}" in
 post)
-	chown root:gdm var/lib/gdm
+	if [ ! -d var/log/gdm ]; then
-	chown -R root:gdm var/lib/gdm/.gconf.mandatory
+		mkdir -p var/log/gdm
+		chown root:gdm var/log/gdm
+	fi
+	[ ! -d var/cache/gdm ] && mkdir -p var/cache/gdm
+	chown gdm:gdm var/lib/gdm > /dev/null
+	chown -R gdm:gdm var/lib/gdm/.gconf.mandatory
 	;;
 esac

srcpkgs/gdm/REMOVE

@@ -3,11 +3,8 @@
 #
 case "${ACTION}" in
 post)
-	if [ -d var/lib/gdm ]; then
+	[ -d var/cache/gdm ] && rm -rf var/cache/gdm
-		rm -rf var/lib/gdm
+	[ -d var/lib/gdm ] && rm -rf var/lib/gdm
-	fi
+	[ -d var/log/gdm ] && rm -rf var/log/gdm
-	if [ -d var/log/gdm ]; then
-		rm -rf var/log/gdm
-	fi
 	;;
 esac

srcpkgs/gdm/patches/0001-Fix-version-in-login-window-when-file-is-empty.patch

@@ -1,28 +0,0 @@
-From d4b48de2495068d9b635a7ab475ace06476d5a42 Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 6 Dec 2010 17:44:44 -0800
-Subject: [PATCH] Fix version in login window when file is empty
-
-fgets return NULL and there is no point duplicating the line with random
-value from buf.
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- gui/simple-greeter/gdm-greeter-login-window.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index ca170a5..0823a3c 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1096,6 +1096,7 @@ file_read_one_line (const char *filename)
- 
-         if (fgets (buf, sizeof (buf), f) == NULL) {
-                 g_warning ("Unable to read from file %s", filename);
-+                goto out;
-         }
- 
-         line = g_strdup (buf);
--- 
-1.7.3.2
-

srcpkgs/gdm/patches/0001-port-to-libpanel-applet-3.0.patch

@@ -1,506 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ed07dce..bf98669 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,7 @@ GTK_REQUIRED_VERSION=2.20.0
- PANGO_REQUIRED_VERSION=1.3.0
- SCROLLKEEPER_REQUIRED_VERSION=0.1.4
- GCONF_REQUIRED_VERSION=2.31.3
--GNOME_PANEL_REQUIRED_VERSION=2.0.0
-+GNOME_PANEL_REQUIRED_VERSION=2.31.90
- LIBXKLAVIER_REQUIRED_VERSION=4.0
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- #FONTCONFIG_REQUIRED_VERSION=2.6.0
-@@ -152,7 +152,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS)
- PKG_CHECK_MODULES(APPLET,
-         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
--        libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION)
-+        libpanelapplet-3.0 >= $GNOME_PANEL_REQUIRED_VERSION)
- AC_SUBST(APPLET_CFLAGS)
- AC_SUBST(APPLET_LIBS)
- 
-diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
-deleted file mode 100644
-index a9b775f..0000000
---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
-+++ /dev/null
-@@ -1,38 +0,0 @@
--<oaf_info>
--  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
--              location="@LIBEXECDIR@/gdm-user-switch-applet">
--
--    <oaf_attribute name="repo_ids" type="stringv">
--      <item value="IDL:Bonobo/GenericFactory:1.0"/>
--      <item value="IDL:Bonobo/Unknown:1.0"/>
--    </oaf_attribute>
--    <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/>
--    <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/>
--    <oaf_attribute name="bonobo:environment" type="stringv">
--       <item value="DBUS_SESSION_BUS_ADDRESS"/>
--     <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
--     <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
--     <oaf_attribute name="bugzilla:component" type="string" value="general"/>
--     <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
--     <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
--    </oaf_attribute>
--  </oaf_server>
--
--  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
--              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
--
--    <oaf_attribute name="repo_ids" type="stringv">
--      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
--      <item value="IDL:Bonobo/Control:1.0"/>
--      <item value="IDL:Bonobo/Unknown:1.0"/>
--    </oaf_attribute>
--    <oaf_attribute name="name" type="string" _value="User Switcher"/>
--    <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/>
--    <oaf_attribute name="panel:icon" type="string" value="stock_people"/>
--    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
--    <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
--    <oaf_attribute name="bugzilla:component" type="string" value="general"/>
--    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
--    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
--  </oaf_server>
--</oaf_info>
-diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-deleted file mode 100644
-index e1845c8..0000000
---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<Root>
--  <popups>
--    <popup name="button3">
--      <menuitem
--       name="About Me Item"
--       verb="GdmAboutMe"
--       _label="Edit Personal _Information"/>
--      <menuitem
--       name="Users and Groups Admin Item"
--       verb="GdmUsersGroupsAdmin"
--       _label="_Edit Users and Groups"/>
--      <menuitem
--       name="About Item"
--       verb="GdmAbout"
--       _label="_About"
--       pixtype="stock"
--       pixname="gtk-about"/>
--    </popup>
--  </popups>
--</Root>
-diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am
-index 2d2cdc0..cebe890 100644
---- a/gui/user-switch-applet/Makefile.am
-+++ b/gui/user-switch-applet/Makefile.am
-@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
- 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
- 	-DSBINDIR=\""$(sbindir)"\"		 	\
- 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
-+	-DGDM_USER_SWITCH_MENU_UI_DIR="\"$(uidir)\""	\
- 	$(GTK_CFLAGS)					\
- 	$(APPLET_CFLAGS)				\
- 	$(NULL)
-@@ -34,34 +35,31 @@ gdm_user_switch_applet_LDADD = 		\
- 	$(APPLET_LIBS)					\
- 	$(NULL)
- 
--# Bonobo UI
--uidir =	$(datadir)/gnome-2.0/ui
--ui_DATA =					\
--	GNOME_FastUserSwitchApplet.xml		\
--	$(NULL)
-+uidir   = $(datadir)/gnome-2.0/ui
-+ui_DATA = gdm-user-switch-applet-menu.xml
- 
--# Bonobo .server
--serverdir = $(libdir)/bonobo/servers
--server_in_files =				\
--	GNOME_FastUserSwitchApplet.server.in	\
--	$(NULL)
--server_DATA = $(server_in_files:.server.in=.server)
-+appletdir       = $(datadir)/gnome-panel/applets
-+applet_in_files = org.gnome.gdm.UserSwitch.panel-applet.in
-+applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
- 
--$(server_in_files): $(server_in_files:.server.in=.server.in.in)
--	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-+$(applet_in_files): $(applet_in_files).in Makefile
-+	$(AM_V_GEN)$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
- 
--@INTLTOOL_SERVER_RULE@
-+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
- 
--EXTRA_DIST = 			\
--	$(ui_DATA)		\
--	GNOME_FastUserSwitchApplet.server.in.in	\
--	$(NULL)
-+servicedir = $(datadir)/dbus-1/services
-+service_in_files = org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-+service_DATA     = $(service_in_files:.service.in=.service)
-+
-+org.gnome.panel.applet.GdmUserSwitchAppletFactory.service: $(service_in_files)
-+	$(AM_V_GEN)$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+
-+EXTRA_DIST = org.gnome.gdm.UserSwitch.panel-applet.in.in \
-+	     $(service_in_files)                         \
-+	     $(ui_DATA)                                  \
-+	     $(NULL)
-+
-+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
- 
--DISTCLEANFILES =                        \
--	$(server_in_files)		\
--	$(server_DATA)			\
--        $(NULL)
-+MAINTAINERCLEANFILES = *~ Makefile.in
- 
--MAINTAINERCLEANFILES =                  \
--        *~                              \
--        Makefile.in
-diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
-index b4f944c..74f7882 100644
---- a/gui/user-switch-applet/applet.c
-+++ b/gui/user-switch-applet/applet.c
-@@ -34,9 +34,6 @@
- 
- #include <dbus/dbus-glib.h>
- 
--#include <bonobo/bonobo-main.h>
--#include <bonobo/bonobo-ui-util.h>
--
- #include <panel-applet.h>
- #include <panel-applet-gconf.h>
- 
-@@ -102,16 +99,15 @@ static gboolean applet_factory (PanelApplet   *applet,
-                                 const char    *iid,
-                                 gpointer       data);
- 
--PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
--                             PANEL_TYPE_APPLET,
--                             "gdm-user-switch-applet", "0",
--                             (PanelAppletFactoryCallback)applet_factory,
--                             NULL)
-+PANEL_APPLET_OUT_PROCESS_FACTORY ("GdmUserSwitchAppletFactory",
-+                                  PANEL_TYPE_APPLET,
-+                                  "gdm-user-switch-applet",
-+                                  applet_factory,
-+                                  NULL)
- 
- static void
--about_me_cb (BonoboUIComponent *ui_container,
--             gpointer           data,
--             const char        *cname)
-+about_me_cb (GtkAction         *action,
-+             gpointer           data)
- {
-         GError *err;
- 
-@@ -120,10 +116,7 @@ about_me_cb (BonoboUIComponent *ui_container,
-                 g_critical ("Could not run `gnome-about-me': %s",
-                             err->message);
-                 g_error_free (err);
--                bonobo_ui_component_set_prop (ui_container,
--                                              "/commands/GdmAboutMe",
--                                              "hidden", "1",
--                                              NULL);
-+                gtk_action_set_visible (action, FALSE);
-         }
- }
- 
-@@ -149,9 +142,8 @@ menubar_button_press_event_cb (GtkWidget      *menubar,
- }
- 
- static void
--about_cb (BonoboUIComponent *ui_container,
--          gpointer           data,
--          const char        *cname)
-+about_cb (GtkAction         *action,
-+          gpointer           data)
- {
-         static const char *authors[] = {
-                 "James M. Cape <jcape@ignore-your.tv>",
-@@ -195,9 +187,8 @@ about_cb (BonoboUIComponent *ui_container,
- 
- 
- static void
--admin_cb (BonoboUIComponent *ui_container,
--          gpointer           data,
--          const char        *cname)
-+admin_cb (GtkAction         *action,
-+          gpointer           data)
- {
- #ifdef USERS_ADMIN
-         char   **args;
-@@ -231,82 +222,6 @@ admin_cb (BonoboUIComponent *ui_container,
- }
- 
- static void
--set_menuitem_icon (BonoboUIComponent *component,
--                   const char        *item_path,
--                   GtkIconTheme      *theme,
--                   const char        *icon_name,
--                   gint               icon_size)
--{
--        GdkPixbuf *pixbuf;
--        int        width;
--        int        height;
--
--        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL);
--        if (pixbuf == NULL) {
--                return;
--        }
--
--        width = gdk_pixbuf_get_width (pixbuf);
--        height = gdk_pixbuf_get_height (pixbuf);
--        if (width > icon_size + 4 || height > icon_size + 4) {
--                GdkPixbuf *tmp;
--                if (height > width) {
--                        width *= (gdouble) icon_size / (gdouble) height;
--                        height = icon_size;
--                } else {
--                        height *= (gdouble) icon_size / (gdouble) width;
--                        width = icon_size;
--                }
--                tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
--                g_object_unref (pixbuf);
--                pixbuf = tmp;
--        }
--
--        bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL);
--        g_object_unref (pixbuf);
--}
--
--static void
--applet_style_set_cb (GtkWidget *widget,
--                     GtkStyle  *old_style,
--                     gpointer   data)
--{
--        BonoboUIComponent *component;
--        GdkScreen         *screen;
--        GtkIconTheme      *theme;
--        int                width;
--        int                height;
--        int                icon_size;
--
--        if (gtk_widget_has_screen (widget)) {
--                screen = gtk_widget_get_screen (widget);
--        } else {
--                screen = gdk_screen_get_default ();
--        }
--
--        if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
--                                               GTK_ICON_SIZE_MENU, &width, &height)) {
--                icon_size = MAX (width, height);
--        } else {
--                icon_size = 16;
--        }
--
--        theme = gtk_icon_theme_get_for_screen (screen);
--        component = panel_applet_get_popup_component (PANEL_APPLET (widget));
--
--        set_menuitem_icon (component,
--                           "/commands/GdmAboutMe",
--                           theme,
--                           "user-info",
--                           icon_size);
--        set_menuitem_icon (component,
--                           "/commands/GdmUsersGroupsAdmin",
--                           theme,
--                           "stock_people",
--                           icon_size);
--}
--
--static void
- applet_change_background_cb (PanelApplet               *applet,
-                              PanelAppletBackgroundType  type,
-                              GdkColor                  *color,
-@@ -1389,18 +1304,23 @@ on_presence_status_text_changed (DBusGProxy    *presence_proxy,
- static gboolean
- fill_applet (PanelApplet *applet)
- {
--        static const BonoboUIVerb menu_verbs[] = {
--                BONOBO_UI_VERB ("GdmAboutMe", about_me_cb),
--                BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb),
--                BONOBO_UI_VERB ("GdmAbout", about_cb),
--                BONOBO_UI_VERB_END
-+        static const GtkActionEntry gdm_user_switch_applet_actions[] = {
-+                { "GdmAboutMe", "user-info", N_("Edit Personal _Information"),
-+                  NULL, NULL,
-+                  G_CALLBACK (about_me_cb) },
-+                { "GdmUsersGroupsAdmin", "stock-people", N_("_Edit Users and Groups"),
-+                  NULL, NULL,
-+                  G_CALLBACK (admin_cb) },
-+                { "GdmAbout", GTK_STOCK_ABOUT, N_("_About"),
-+                  NULL, NULL,
-+                  G_CALLBACK (about_cb) },
-         };
-         static gboolean    first_time = FALSE;
-         char              *tmp;
--        BonoboUIComponent *popup_component;
-         GdmAppletData     *adata;
-         GError            *error;
-         DBusGConnection   *bus;
-+        GtkActionGroup    *action_group;
- 
-         if (!first_time) {
-                 first_time = TRUE;
-@@ -1438,52 +1358,51 @@ fill_applet (PanelApplet *applet)
-         gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
-         gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet");
-         panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
--        panel_applet_setup_menu_from_file (applet, NULL,
--                                           DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml",
--                                           NULL, menu_verbs, adata);
- 
--        popup_component = panel_applet_get_popup_component (applet);
-+        action_group = gtk_action_group_new ("GDM User Switch Applet Actions");
-+        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-+        gtk_action_group_add_actions (action_group,
-+                                      gdm_user_switch_applet_actions,
-+                                      G_N_ELEMENTS (gdm_user_switch_applet_actions),
-+                                      adata);
-+
-+        panel_applet_setup_menu_from_file (applet,
-+                                           GDM_USER_SWITCH_MENU_UI_DIR G_DIR_SEPARATOR_S "gdm-user-switch-applet-menu.xml",
-+                                           action_group);
- 
-         /* Hide the admin context menu items if locked down or no cmd-line */
-         if (gconf_client_get_bool (adata->client,
-                                    LOCKDOWN_COMMAND_LINE_KEY,
-                                    NULL) ||
-             panel_applet_get_locked_down (applet)) {
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/popups/button3/GdmSeparator",
--                                              "hidden", "1", NULL);
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmUsersGroupsAdmin",
--                                              "hidden", "1", NULL);
-+                GtkAction *action;
-+
-+                action = gtk_action_group_get_action (action_group, "GdmUsersGroupsAdmin");
-+                gtk_action_set_visible (action, FALSE);
-         } else {
-+                GtkAction *action;
-+
- #ifndef USERS_ADMIN
- #  ifdef GDM_SETUP
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/popups/button3/GdmSeparator",
--                                              "hidden", "1",
--                                              NULL);
- #  endif /* !GDM_SETUP */
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmUsersGroupsAdmin",
--                                              "hidden", "1",
--                                              NULL);
-+                action = gtk_action_group_get_action (action_group, "GdmUsersGroupsAdmin");
-+                gtk_action_set_visible (action, FALSE);
- #endif /* !USERS_ADMIN */
-         }
- 
-         /* Hide the gdmphotosetup item if it can't be found in the path. */
-         tmp = g_find_program_in_path ("gnome-about-me");
-         if (!tmp) {
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmAboutMe",
--                                              "hidden", "1",
--                                              NULL);
-+                GtkAction *action;
-+
-+                action = gtk_action_group_get_action (action_group, "GdmAboutMe");
-+                gtk_action_set_visible (action, FALSE);
-         } else {
-                 g_free (tmp);
-         }
- 
--        g_signal_connect (adata->applet,
--                          "style-set",
--                          G_CALLBACK (applet_style_set_cb), adata);
-+        g_object_unref (action_group);
-+
-         g_signal_connect (applet,
-                           "change-background",
-                           G_CALLBACK (applet_change_background_cb), adata);
-@@ -1655,7 +1574,7 @@ applet_factory (PanelApplet   *applet,
- {
-         gboolean ret;
-         ret = FALSE;
--        if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) {
-+        if (strcmp (iid, "GdmUserSwitchApplet") == 0) {
-                 ret = fill_applet (applet);
-         }
-         return ret;
-diff --git a/gui/user-switch-applet/gdm-user-switch-applet-menu.xml b/gui/user-switch-applet/gdm-user-switch-applet-menu.xml
-new file mode 100644
-index 0000000..78301b3
---- /dev/null
-+++ b/gui/user-switch-applet/gdm-user-switch-applet-menu.xml
-@@ -0,0 +1,4 @@
-+<menuitem name="About Me Item" action="GdmAboutMe"/>
-+<menuitem name="Users and Groups Admin Item" action="GdmUsersGroupsAdmin"/>
-+<menuitem name="About Item" action="GdmAbout"/>
-+
-diff --git a/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in b/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
-new file mode 100644
-index 0000000..3c77dfb
---- /dev/null
-+++ b/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
-@@ -0,0 +1,16 @@
-+[Applet Factory]
-+Id=GdmUserSwitchAppletFactory
-+Location=@LIBEXECDIR@/gdm-user-switch-applet
-+_Name=User Switcher Applet Factory
-+_Description=User Switcher Applet Factory
-+
-+[GdmUserSwitchApplet]
-+_Name=User Switcher
-+_Description=A menu to quickly switch between users
-+BonoboId=OAFIID:GNOME_FastUserSwitchApplet
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gdm
-+X-GNOME-Bugzilla-Component=general
-+X-GNOME-Bugzilla-Version=@VERSION@
-+X-GNOME-Bugzilla-OtherBinaries=gdm-user-switch-applet
-+
-diff --git a/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in b/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-new file mode 100644
-index 0000000..7bf900f
---- /dev/null
-+++ b/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.gnome.panel.applet.GdmUserSwitchAppletFactory
-+Exec=@LIBEXECDIR@/gdm-user-switch-applet
-+
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 1fccb90..5340391 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -86,8 +86,7 @@ gui/simple-greeter/gdm-user-chooser-widget.c
- gui/simple-greeter/greeter-main.c
- gui/user-switch-applet/applet.c
- gui/user-switch-applet/gdm-entry-menu-item.c
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-+gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
- utils/gdmflexiserver.c
- utils/gdm-screenshot.c
- 
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 0269a0f..9032c03 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -7,7 +7,7 @@
- # remove these unless you fix "make distcheck" a different way.
- #
- data/gdm.schemas.in
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in
-+gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in
- data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
- data/greeter-autostart/gdm-simple-greeter.desktop.in
- data/greeter-autostart/gnome-power-manager.desktop.in
--- 
-1.7.2.3
-

srcpkgs/gdm/patches/correctly-give-focus-to-user-chooser.patch

@@ -1,46 +0,0 @@
-From b971eb1038cb92ed8211b68a7d2a99a98d86ed7f Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Wed, 12 Jan 2011 18:38:46 +0100
-Subject: [PATCH] Correctly give focus to the user chooser on startup
-
-We manually handle how focus works in the GdmChooserWidget container,
-and we try to automatically move the focus to the treeview inside the
-chooser. However, it fails the first time because the treeview is not
-realized yet and the logic in the code assumes that if focus moved to
-the chooser, it moved to the treeview, so later attempt to get the focus
-grabbed by the treeview are just ignored.
-
-It works fine when using gtk_widget_child_focus() to give the focus to
-the treeview. And this makes more sense since the chooser is a container
-anyway.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629310
----
- gui/simple-greeter/gdm-chooser-widget.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
-index db2d9b2..ebbfdb9 100644
---- a/gui/simple-greeter/gdm-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-chooser-widget.c
-@@ -910,17 +910,13 @@ _grab_focus (GtkWidget *widget)
- 
-         foc_widget = GDM_CHOOSER_WIDGET (widget)->priv->items_view;
-         g_debug ("GdmChooserWidget: grabbing focus");
--        if (! gtk_widget_get_realized (foc_widget)) {
--                g_debug ("GdmChooserWidget: not grabbing focus - not realized");
--                return;
--        }
- 
-         if (gtk_widget_has_focus (foc_widget)) {
-                 g_debug ("GdmChooserWidget: not grabbing focus - already has it");
-                 return;
-         }
- 
--        gtk_widget_grab_focus (foc_widget);
-+        gtk_widget_child_focus (foc_widget, GTK_DIR_TAB_FORWARD);
- }
- 
- static void
---
-1.7.3.4

srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch

@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c.old
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;