diff --git a/srcpkgs/GConf/GConf-devel.template b/srcpkgs/GConf/GConf-devel.template
index 2fa9528ac20..166efa5c8ec 100644
--- a/srcpkgs/GConf/GConf-devel.template
+++ b/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
}
diff --git a/srcpkgs/GConf/files/gconf-merge-schema.sh b/srcpkgs/GConf/files/gconf-merge-schema.sh
new file mode 100644
index 00000000000..433be9c1fdf
--- /dev/null
+++ b/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 '' > "$OUTFILE"
+echo '' >> "$OUTFILE"
+
+while [ -n "$1" ]; do
+ if [ -f "$1" ]; then
+ sed -e '/||g' \
+ -e 's|||g' \
+ -e 's|||g' \
+ -e 's|||g' "$1" >> "$OUTFILE"
+ fi
+ shift
+done
+
+echo '' >> "$OUTFILE"
+if [ "$DOMAIN" != "" ]; then
+ sed -ri "s/^([[:space:]]*)()/\1$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
+fi
diff --git a/srcpkgs/GConf/gir-gconf.template b/srcpkgs/GConf/gir-gconf.template
deleted file mode 100644
index 99869153341..00000000000
--- a/srcpkgs/GConf/gir-gconf.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/GConf/patches/01_xml-gettext-domain.patch b/srcpkgs/GConf/patches/01_xml-gettext-domain.patch
new file mode 100644
index 00000000000..f2345c3a807
--- /dev/null
+++ b/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 @@
+
+-
++
+
+
+
+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 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 \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;
+ };
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index eda0f628661..dacbd813264 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,13 +1,12 @@
# Template file for 'GConf'
pkgname=GConf
-version=2.32.0
-revision=1
+version=2.32.2
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 "
-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
diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index 308e0ddda0b..0f9c4268f33 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/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"
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index bb6d30d0e90..5b6213e0d59 100644
--- a/srcpkgs/MesaLib/template
+++ b/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 "
-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
diff --git a/srcpkgs/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template
index 7df135e27aa..dc921d5589e 100644
--- a/srcpkgs/NetworkManager/NetworkManager-devel.template
+++ b/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
}
diff --git a/srcpkgs/NetworkManager/depends b/srcpkgs/NetworkManager/depends
index daa819845a3..e3955c234d5 100644
--- a/srcpkgs/NetworkManager/depends
+++ b/srcpkgs/NetworkManager/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.8"
+abi_depends=">=0.8.998"
api_depends="${abi_depends}"
diff --git a/srcpkgs/NetworkManager/files/nm-system-settings.conf b/srcpkgs/NetworkManager/files/NetworkManager.conf
similarity index 100%
rename from srcpkgs/NetworkManager/files/nm-system-settings.conf
rename to srcpkgs/NetworkManager/files/NetworkManager.conf
diff --git a/srcpkgs/NetworkManager/patches/create_dirs.patch b/srcpkgs/NetworkManager/patches/create_dirs.patch
deleted file mode 100644
index 76e67d9e26f..00000000000
--- a/srcpkgs/NetworkManager/patches/create_dirs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cbb0d6d116e2d5e844c2c118f2f707d10e6b6fc4 Mon Sep 17 00:00:00 2001
-From: Dan Williams
-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
-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
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index a1050fe1608..3211366100d 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,22 +1,26 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=0.8.2
-revision=2
+version=0.8.998
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 "
-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.
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index eb69a4c4d62..de6ca45f058 100644
--- a/srcpkgs/Thunar/template
+++ b/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"
diff --git a/srcpkgs/accountsservice-devel b/srcpkgs/accountsservice-devel
new file mode 120000
index 00000000000..345043b0d59
--- /dev/null
+++ b/srcpkgs/accountsservice-devel
@@ -0,0 +1 @@
+accountsservice
\ No newline at end of file
diff --git a/srcpkgs/accountsservice/accountsservice-devel.template b/srcpkgs/accountsservice/accountsservice-devel.template
new file mode 100644
index 00000000000..410390332f0
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/at-spi/depends b/srcpkgs/accountsservice/depends
similarity index 55%
rename from srcpkgs/at-spi/depends
rename to srcpkgs/accountsservice/depends
index b87fedf064c..ac52425fa3f 100644
--- a/srcpkgs/at-spi/depends
+++ b/srcpkgs/accountsservice/depends
@@ -1,2 +1,2 @@
-abi_depends=">=1.32.0"
+abi_depends=">=0.6.4"
api_depends="${abi_depends}"
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
new file mode 100644
index 00000000000..04d3f8ffe12
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 813eabccdc2..4c896937112 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/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
diff --git a/srcpkgs/at-spi-devel b/srcpkgs/at-spi-devel
deleted file mode 120000
index 81c6c1bd825..00000000000
--- a/srcpkgs/at-spi-devel
+++ /dev/null
@@ -1 +0,0 @@
-at-spi
\ No newline at end of file
diff --git a/srcpkgs/at-spi-python b/srcpkgs/at-spi-python
deleted file mode 120000
index 81c6c1bd825..00000000000
--- a/srcpkgs/at-spi-python
+++ /dev/null
@@ -1 +0,0 @@
-at-spi
\ No newline at end of file
diff --git a/srcpkgs/at-spi/at-spi-python.template b/srcpkgs/at-spi/at-spi-python.template
deleted file mode 100644
index 5ce85ef51ef..00000000000
--- a/srcpkgs/at-spi/at-spi-python.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/at-spi/template b/srcpkgs/at-spi/template
deleted file mode 100644
index 3e62181651b..00000000000
--- a/srcpkgs/at-spi/template
+++ /dev/null
@@ -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 "
-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
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
new file mode 100644
index 00000000000..bd5276562e0
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/at-spi2-core-devel b/srcpkgs/at-spi2-core-devel
new file mode 120000
index 00000000000..da1f75dcf9f
--- /dev/null
+++ b/srcpkgs/at-spi2-core-devel
@@ -0,0 +1 @@
+at-spi2-core
\ No newline at end of file
diff --git a/srcpkgs/at-spi/at-spi-devel.template b/srcpkgs/at-spi2-core/at-spi2-core-devel.template
similarity index 63%
rename from srcpkgs/at-spi/at-spi-devel.template
rename to srcpkgs/at-spi2-core/at-spi2-core-devel.template
index 907de791c89..cb8f5397b3f 100644
--- a/srcpkgs/at-spi/at-spi-devel.template
+++ b/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/{doc,idl,gtk-doc} ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/at-spi2-core/depends b/srcpkgs/at-spi2-core/depends
new file mode 100644
index 00000000000..8c79141c83b
--- /dev/null
+++ b/srcpkgs/at-spi2-core/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.91.91"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
new file mode 100644
index 00000000000..71f04fc4d3e
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/atk/depends b/srcpkgs/atk/depends
index 6af7195b6ad..75ebe993f13 100644
--- a/srcpkgs/atk/depends
+++ b/srcpkgs/atk/depends
@@ -1,2 +1,2 @@
abi_depends=">=1.26.0"
-api_depends="${abi_depends}"
+api_depends=">=1.33.6"
diff --git a/srcpkgs/atk/gir-atk.template b/srcpkgs/atk/gir-atk.template
deleted file mode 100644
index 81d67b2412c..00000000000
--- a/srcpkgs/atk/gir-atk.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index d6e07db2660..94bd986e6ba 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -1,11 +1,11 @@
# Template build file for 'atk'.
pkgname=atk
-version=1.32.0
-distfiles="${GNOME_SITE}/atk/1.32/$pkgname-$version.tar.bz2"
+version=2.0.0
+distfiles="${GNOME_SITE}/atk/2.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Set of interfaces for accessibility"
maintainer="Juan RP "
-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
diff --git a/srcpkgs/gir-avahi b/srcpkgs/avahi-ui-libs-gtk3
similarity index 100%
rename from srcpkgs/gir-avahi
rename to srcpkgs/avahi-ui-libs-gtk3
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index b01c2898c75..3186160f59d 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/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
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index 1452d3219de..a63a2176ff8 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/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
}
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index 26a57de9b9e..e100951b172 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/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
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index c0c79c26c38..02b788746d7 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/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/lib/libavahi-ui.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/include/avahi-ui* ${DESTDIR}/usr/include
+ mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui* ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
new file mode 100644
index 00000000000..c0f523c7907
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template
index 613fccd3cd3..91e4acac54b 100644
--- a/srcpkgs/avahi/avahi-ui-utils.template
+++ b/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
diff --git a/srcpkgs/avahi/gir-avahi.template b/srcpkgs/avahi/gir-avahi.template
deleted file mode 100644
index f0fdae33a09..00000000000
--- a/srcpkgs/avahi/gir-avahi.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index dda310c62ed..ff49e9f19be 100644
--- a/srcpkgs/avahi/template
+++ b/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
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman
- --disable-dbm --localstatedir=/var --disable-gtk3"
+--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+--with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+--with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
+--with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman
+--disable-dbm --localstatedir=/var"
short_desc="Multicast DNS Service Discovery"
maintainer="Juan RP "
-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
diff --git a/srcpkgs/babl/gir-babl.template b/srcpkgs/babl/gir-babl.template
deleted file mode 100644
index 2e6c73b8b98..00000000000
--- a/srcpkgs/babl/gir-babl.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 22d52187eaa..0cb38dbbd82 100644
--- a/srcpkgs/babl/template
+++ b/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
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 548207c412d..957cc08e4c5 100644
--- a/srcpkgs/boost/template
+++ b/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"
diff --git a/srcpkgs/brasero/depends b/srcpkgs/brasero/depends
index 0fa3c81ea8c..6e8d7e9a547 100644
--- a/srcpkgs/brasero/depends
+++ b/srcpkgs/brasero/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.32.1"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/brasero/gir-brasero.template b/srcpkgs/brasero/gir-brasero.template
deleted file mode 100644
index c6820bec9ca..00000000000
--- a/srcpkgs/brasero/gir-brasero.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 92749b3f2b2..82f035e0030 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,12 +1,12 @@
# Template file for 'brasero'
pkgname=brasero
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+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 "
-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 gst-plugins-base-devel
-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 gnome-doc-utils
+Add_dependency build gobject-introspection
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
diff --git a/srcpkgs/cantarell-fonts/INSTALL b/srcpkgs/cantarell-fonts/INSTALL
new file mode 100644
index 00000000000..e614314b42d
--- /dev/null
+++ b/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
diff --git a/srcpkgs/cantarell-fonts/REMOVE b/srcpkgs/cantarell-fonts/REMOVE
new file mode 100644
index 00000000000..e614314b42d
--- /dev/null
+++ b/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
diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
new file mode 100644
index 00000000000..67b70fe4285
--- /dev/null
+++ b/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 "
+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
+}
diff --git a/srcpkgs/clutter-gtk-devel b/srcpkgs/clutter-gtk-devel
new file mode 120000
index 00000000000..e4c7380ff03
--- /dev/null
+++ b/srcpkgs/clutter-gtk-devel
@@ -0,0 +1 @@
+clutter-gtk
\ No newline at end of file
diff --git a/srcpkgs/clutter-gtk/clutter-gtk-devel.template b/srcpkgs/clutter-gtk/clutter-gtk-devel.template
new file mode 100644
index 00000000000..006a0098c1f
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/gnome-vfs/depends b/srcpkgs/clutter-gtk/depends
similarity index 55%
rename from srcpkgs/gnome-vfs/depends
rename to srcpkgs/clutter-gtk/depends
index 6a373ede15e..fac3150201d 100644
--- a/srcpkgs/gnome-vfs/depends
+++ b/srcpkgs/clutter-gtk/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.24.2"
+abi_depends=">=0.91.8"
api_depends="${abi_depends}"
diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
new file mode 100644
index 00000000000..373fbd48499
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/clutter/gir-clutter.template b/srcpkgs/clutter/gir-clutter.template
deleted file mode 100644
index 8e563de0b28..00000000000
--- a/srcpkgs/clutter/gir-clutter.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 9edfffa2e35..4c7c4e539ba 100644
--- a/srcpkgs/clutter/template
+++ b/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 "
-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
diff --git a/srcpkgs/dconf/dconf-devel.template b/srcpkgs/dconf/dconf-devel.template
index c0e235bfe53..f39230672e1 100644
--- a/srcpkgs/dconf/dconf-devel.template
+++ b/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} \
- ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,vala} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/dconf/dconf-editor.template b/srcpkgs/dconf/dconf-editor.template
index 86707790bf0..4a4d7203fb8 100644
--- a/srcpkgs/dconf/dconf-editor.template
+++ b/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
}
diff --git a/srcpkgs/dconf/gir-dconf.template b/srcpkgs/dconf/gir-dconf.template
deleted file mode 100644
index 91aa19c2d46..00000000000
--- a/srcpkgs/dconf/gir-dconf.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 4c7c490a946..da674108752 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,22 +1,24 @@
# Template file for 'dconf'
pkgname=dconf
-version=0.5.1
-distfiles="${GNOME_SITE}/$pkgname/0.5/$pkgname-$version.tar.bz2"
+version=0.7.3
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="A low-level configuration system"
maintainer="Juan RP "
-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
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 06c3c76e3e6..b47ff2f949b 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/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 "
-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
diff --git a/srcpkgs/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template
index dd7980a38c6..d36135eb8f1 100644
--- a/srcpkgs/dhcpcd-dbus/template
+++ b/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
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 6dbfc17aadb..4541c9d4009 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/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
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
new file mode 100644
index 00000000000..135171fc577
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/eog/eog-devel.template b/srcpkgs/eog/eog-devel.template
index 7b7f983286b..ef4983b3e1b 100644
--- a/srcpkgs/eog/eog-devel.template
+++ b/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 GConf-devel
-Add_dependency run gtk+-devel
+Add_dependency run libpeas-devel
+Add_dependency run gtk+3-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 zlib-devel
+Add_dependency run librsvg-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 pygtk-devel
+Add_dependency run libgirepository-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
}
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 5748a684fd5..427229ec13a 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,74 +1,76 @@
# Template file for 'eog'
pkgname=eog
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/eog/3.0/eog-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---disable-scrollkeeper"
+configure_args="--disable-scrollkeeper --localstatedir=/var"
short_desc="Eye of GNOME graphics viewer program"
maintainer="Juan RP "
-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 GConf
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run libpeas
+Add_dependency run gtk+3
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 zlib
+Add_dependency run librsvg
+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 GConf-devel
-Add_dependency build gtk+-devel
+Add_dependency build libpeas-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 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 zlib-devel
+Add_dependency build librsvg-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 librsvg-devel
-Add_dependency build which
+Add_dependency build libgirepository-devel
+Add_dependency build zlib-devel
+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
diff --git a/srcpkgs/epiphany/depends b/srcpkgs/epiphany/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/epiphany/depends
+++ b/srcpkgs/epiphany/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template
index 0091e768b16..6dd273cfff7 100644
--- a/srcpkgs/epiphany/epiphany-devel.template
+++ b/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 fontconfig-devel
-Add_dependency run libsoup-gnome-devel
-Add_dependency run libsoup-devel
-Add_dependency run glib-devel
+Add_dependency run gtk+3-devel
+Add_dependency run libxml2-devel
Add_dependency run libgnome-keyring-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run nss-devel
-Add_dependency run nspr-devel
+Add_dependency run libsoup-devel
+Add_dependency run libsoup-gnome-devel
+Add_dependency run libgirepository-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
}
diff --git a/srcpkgs/epiphany/gir-epiphany.template b/srcpkgs/epiphany/gir-epiphany.template
deleted file mode 100644
index ceae4059eac..00000000000
--- a/srcpkgs/epiphany/gir-epiphany.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 93f473e3926..5ad2dd69512 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,14 +1,13 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=2.30.6
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-introspection
+configure_args="--disable-schemas-compile --disable-scrollkeeper
--localstatedir=/var --enable-network-manager --without-ca-file"
short_desc="Intuitive GNOME web browser"
maintainer="Juan RP "
-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 fontconfig
-Add_dependency run libsoup-gnome
-Add_dependency run libsoup
-Add_dependency run glib
+Add_dependency run gtk+3
+Add_dependency run libxml2
Add_dependency run libgnome-keyring
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run nss
-Add_dependency run nspr
-Add_dependency run NetworkManager
+Add_dependency run libsoup
+Add_dependency run libsoup-gnome
+Add_dependency run libgirepository
+Add_dependency run webkit-gtk3
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 fontconfig-devel
-Add_dependency build libsoup-gnome-devel
-Add_dependency build libsoup-devel
-Add_dependency build glib-devel
+Add_dependency build gtk+3-devel
+Add_dependency build libxml2-devel
Add_dependency build libgnome-keyring-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build nss-devel
-Add_dependency build nspr-devel
-Add_dependency build NetworkManager-devel
-#Add_dependency build gobject-introspection
+Add_dependency build libsoup-devel
+Add_dependency build libsoup-gnome-devel
+Add_dependency build libgirepository-devel
+Add_dependency build webkit-gtk3-devel
+Add_dependency build glade3-devel
+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
-}
diff --git a/srcpkgs/evolution-data-server/depends b/srcpkgs/evolution-data-server/depends
index 6a11fcf61de..6e8d7e9a547 100644
--- a/srcpkgs/evolution-data-server/depends
+++ b/srcpkgs/evolution-data-server/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.32.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/evolution-data-server/evolution-data-server-devel.template b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
index 49110d4b70b..46511067ac7 100644
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/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
}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a1eb26830e6..9a07283f58c 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,34 +1,34 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=2.32.1
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$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 "
-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
diff --git a/srcpkgs/farsight2-devel b/srcpkgs/farsight2-devel
new file mode 120000
index 00000000000..c3ee91619f1
--- /dev/null
+++ b/srcpkgs/farsight2-devel
@@ -0,0 +1 @@
+farsight2
\ No newline at end of file
diff --git a/srcpkgs/libbonobo/depends b/srcpkgs/farsight2/depends
similarity index 55%
rename from srcpkgs/libbonobo/depends
rename to srcpkgs/farsight2/depends
index 057169faad3..0d5a9dc3785 100644
--- a/srcpkgs/libbonobo/depends
+++ b/srcpkgs/farsight2/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.24.3"
+abi_depends=">=0.0.26"
api_depends="${abi_depends}"
diff --git a/srcpkgs/farsight2/farsight2-devel.template b/srcpkgs/farsight2/farsight2-devel.template
new file mode 100644
index 00000000000..a1543475656
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/farsight2/template b/srcpkgs/farsight2/template
new file mode 100644
index 00000000000..670b551ef4d
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/ffmpeg/depends b/srcpkgs/ffmpeg/depends
index c483c1e92d4..b127b172a58 100644
--- a/srcpkgs/ffmpeg/depends
+++ b/srcpkgs/ffmpeg/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.5.1"
+abi_depends=">=0.6"
api_depends="${abi_depends}"
diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template
index ebd4b5f93e0..57f01b171bd 100644
--- a/srcpkgs/ffmpeg/ffmpeg-devel.template
+++ b/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
diff --git a/srcpkgs/ffmpeg/libavcodec.template b/srcpkgs/ffmpeg/libavcodec.template
new file mode 100644
index 00000000000..e9f917b2b17
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/libavdevice.template b/srcpkgs/ffmpeg/libavdevice.template
new file mode 100644
index 00000000000..0db561edc4b
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/libavformat.template b/srcpkgs/ffmpeg/libavformat.template
new file mode 100644
index 00000000000..1c3a450e3f3
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/libavutil.template b/srcpkgs/ffmpeg/libavutil.template
new file mode 100644
index 00000000000..367ab3779be
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/libpostproc.template b/srcpkgs/ffmpeg/libpostproc.template
new file mode 100644
index 00000000000..52fd74f6bcb
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/libswscale.template b/srcpkgs/ffmpeg/libswscale.template
new file mode 100644
index 00000000000..01a17296360
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index d40b76768b0..8578015068b 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,19 +1,11 @@
# Template file for 'ffmpeg'
pkgname=ffmpeg
-version=0.5.1
-revision=2
-distfiles="http://launchpad.net/ffmpeg/0.5/$version/+download/ffmpeg-${version}.tar.bz2"
-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"
+version=0.6
+distfiles="http://ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"
+build_style=custom-install
short_desc="Decoding, encoding and streaming software"
maintainer="Juan RP "
-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 SDL
+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 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 alsa-lib
-Add_dependency run libX11
-Add_dependency run libXext
+Add_dependency run libavdevice
+Add_dependency run libpostproc
+Add_dependency run libswscale
+Add_dependency run SDL
+Add_dependency run libvpx
Add_dependency build pkg-config
-Add_dependency build glibc-devel
-Add_dependency build freetype-devel
-Add_dependency build SDL-devel
+Add_dependency build perl ">=0"
+Add_dependency build yasm
+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 alsa-lib-devel
-Add_dependency build libX11-devel
-Add_dependency build libXext-devel
+Add_dependency build SDL-devel
+Add_dependency build libvpx-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
+}
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index b59a9ad1fa1..645d5ab7d6d 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,14 +1,13 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--localstatedir=/var --disable-schemas-install
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---disable-scrollkeeper"
+configure_args="--localstatedir=/var --disable-scrollkeeper --enable-magic
+--disable-schemas-compile --disable-static"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Juan RP "
-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
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 593b582f7c1..7e42aecf6e4 100644
--- a/srcpkgs/firefox/template
+++ b/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 "
-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/pixmaps || return 1
+ install -d ${DESTDIR}/usr/share/applications
+ 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
}
diff --git a/srcpkgs/folks-devel b/srcpkgs/folks-devel
new file mode 120000
index 00000000000..2e04c4e80b8
--- /dev/null
+++ b/srcpkgs/folks-devel
@@ -0,0 +1 @@
+folks
\ No newline at end of file
diff --git a/srcpkgs/libbonoboui/depends b/srcpkgs/folks/depends
similarity index 55%
rename from srcpkgs/libbonoboui/depends
rename to srcpkgs/folks/depends
index 057169faad3..7855591013a 100644
--- a/srcpkgs/libbonoboui/depends
+++ b/srcpkgs/folks/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.24.3"
+abi_depends=">=0.4.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/folks/folks-devel.template b/srcpkgs/folks/folks-devel.template
new file mode 100644
index 00000000000..3d8969b9be5
--- /dev/null
+++ b/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
+}
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
new file mode 100644
index 00000000000..3293a771bca
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/gcalctool/template b/srcpkgs/gcalctool/template
new file mode 100644
index 00000000000..5a03680ef53
--- /dev/null
+++ b/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 "
+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
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
index 0b0b6e4fe24..09dd7a5670e 100644
--- a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
+++ b/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
diff --git a/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template b/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template
deleted file mode 100644
index 66422ab8608..00000000000
--- a/srcpkgs/gdk-pixbuf/gir-gdk-pixbuf.template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 9148ece2ed3..4023e4a6b8f 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,19 +1,19 @@
# Template build file for 'gdk-pixbuf'.
pkgname=gdk-pixbuf
-version=2.22.1
-distfiles="${GNOME_SITE}/$pkgname/2.22/$pkgname-$version.tar.bz2"
+version=2.23.1
+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 "
-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
diff --git a/srcpkgs/gdm/INSTALL b/srcpkgs/gdm/INSTALL
index f9b9fb6b469..26ad51ed66a 100644
--- a/srcpkgs/gdm/INSTALL
+++ b/srcpkgs/gdm/INSTALL
@@ -3,7 +3,12 @@
#
case "${ACTION}" in
post)
- chown root:gdm var/lib/gdm
- chown -R root:gdm var/lib/gdm/.gconf.mandatory
+ if [ ! -d var/log/gdm ]; then
+ 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
diff --git a/srcpkgs/gdm/REMOVE b/srcpkgs/gdm/REMOVE
index 1aeccc1025c..a74b0357dae 100644
--- a/srcpkgs/gdm/REMOVE
+++ b/srcpkgs/gdm/REMOVE
@@ -3,11 +3,8 @@
#
case "${ACTION}" in
post)
- if [ -d var/lib/gdm ]; then
- rm -rf var/lib/gdm
- fi
- if [ -d var/log/gdm ]; then
- rm -rf var/log/gdm
- fi
+ [ -d var/cache/gdm ] && rm -rf var/cache/gdm
+ [ -d var/lib/gdm ] && rm -rf var/lib/gdm
+ [ -d var/log/gdm ] && rm -rf var/log/gdm
;;
esac
diff --git a/srcpkgs/gdm/patches/0001-Fix-version-in-login-window-when-file-is-empty.patch b/srcpkgs/gdm/patches/0001-Fix-version-in-login-window-when-file-is-empty.patch
deleted file mode 100644
index 2401fc93a51..00000000000
--- a/srcpkgs/gdm/patches/0001-Fix-version-in-login-window-when-file-is-empty.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d4b48de2495068d9b635a7ab475ace06476d5a42 Mon Sep 17 00:00:00 2001
-From: Ionut Biru
-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
----
- 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
-
diff --git a/srcpkgs/gdm/patches/0001-port-to-libpanel-applet-3.0.patch b/srcpkgs/gdm/patches/0001-port-to-libpanel-applet-3.0.patch
deleted file mode 100644
index 91ada783598..00000000000
--- a/srcpkgs/gdm/patches/0001-port-to-libpanel-applet-3.0.patch
+++ /dev/null
@@ -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 @@
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-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 @@
--
--
--
--
--
--
--
--
--
-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
-
--#include
--#include
--
- #include
- #include
-
-@@ -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 ",
-@@ -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 @@
-+
-+
-+
-+
-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
-
diff --git a/srcpkgs/gdm/patches/correctly-give-focus-to-user-chooser.patch b/srcpkgs/gdm/patches/correctly-give-focus-to-user-chooser.patch
deleted file mode 100644
index e08675a36d1..00000000000
--- a/srcpkgs/gdm/patches/correctly-give-focus-to-user-chooser.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b971eb1038cb92ed8211b68a7d2a99a98d86ed7f Mon Sep 17 00:00:00 2001
-From: Vincent Untz
-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
diff --git a/srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch b/srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 0bda94b374c..00000000000
--- a/srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -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
- #include
- #include
-+#include
-+#include
-
- #include
- #include
-@@ -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;
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 91fab607121..f3ac54aced6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,18 +1,13 @@
# Template file for 'gdm'
pkgname=gdm
-version=2.32.0
-revision=5
-patch_args="-Np1"
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --enable-console-helper
---enable-authentication-scheme=pam --enable-ipv6
---with-user=gdm --with-group=gdm --with-xevie --exec-prefix=/usr"
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --localstatedir=/var"
short_desc="GNOME Display Manager"
maintainer="Juan RP "
-checksum=f47acd19ed10d6fbb37c3e2b54f5b392c7020db67f71db3f75567ead30ab2fa4
+checksum=2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff
long_desc="
GDM is the GNOME Display Manager, it is the little proggie that runs
in the background, runs your X sessions, presents you with a login box
@@ -27,91 +22,69 @@ long_desc="
xdmcp a little bit in places where I thought xdm was lacking (but is
still compatible with xdm's xdmcp)."
-keep_empty_dirs=yes
-conf_files="/etc/gdm/custom.conf /etc/pam.d/gdm /etc/pam.d/gdm-autologin"
+conf_files="
+/etc/gdm/custom.conf
+/etc/gdm/Init/Default
+/etc/gdm/PreSession/Default
+/etc/gdm/PostSession/Default
+/etc/pam.d/gdm
+/etc/pam.d/gdm-autologin"
+
gconf_schemas="gdm-simple-greeter.schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
# Create the 'gdm' system user/group.
system_accounts="gdm"
gdm_homedir="/var/lib/gdm"
-gdm_descr="GNOME Display Manager user"
openrc_services="gdm default true"
Add_dependency run glibc
+Add_dependency run glib
Add_dependency run libX11
-Add_dependency run libXau
Add_dependency run dbus-glib
Add_dependency run dbus-libs
-Add_dependency run glib
-Add_dependency run gnome-panel
-Add_dependency run GConf
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run libbonobo
-Add_dependency run ORBit2
+Add_dependency run libXau
Add_dependency run pam
-Add_dependency run libXdmcp
-Add_dependency run libxklavier
-Add_dependency run libxml2
+Add_dependency run accountsservice
+Add_dependency run gtk+3
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run pango
+Add_dependency run GConf
+Add_dependency run fontconfig
Add_dependency run upower
-Add_dependency run libcanberra
+Add_dependency run libXdmcp
Add_dependency run tcp_wrappers-libs
+Add_dependency run libcanberra
+Add_dependency run libXrandr
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
+Add_dependency build glib-devel
Add_dependency build libX11-devel
-Add_dependency build libXau-devel
Add_dependency build dbus-glib-devel
Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build gnome-panel-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-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 libbonobo-devel
-Add_dependency build ORBit2-devel
+Add_dependency build libXau-devel
Add_dependency build pam-devel
-Add_dependency build libXdmcp-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libxml2-devel
+Add_dependency build accountsservice-devel
+Add_dependency build gtk+3-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build pango-devel
+Add_dependency build GConf-devel
+Add_dependency build fontconfig-devel
Add_dependency build upower-devel
-Add_dependency build libcanberra-devel
+Add_dependency build libXdmcp-devel
Add_dependency build tcp_wrappers-devel
-Add_dependency build at-spi
-Add_dependency build automake
+Add_dependency build libcanberra-devel
+Add_dependency build libXrandr-devel
Add_dependency full ConsoleKit-x11
Add_dependency full xorg-server
Add_dependency full hicolor-icon-theme
Add_dependency full polkit-gnome
-pre_configure()
-{
- cd ${wrksrc} && autoreconf -fi
-}
-
post_install()
{
# Use our own pam files.
@@ -125,4 +98,8 @@ post_install()
# Transform ${exec_prefix} to start at-spi-registryd!
sed -i -e "s|\${exec_prefix}|/usr|" \
${DESTDIR}//usr/share/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
+
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
}
diff --git a/srcpkgs/gedit/depends b/srcpkgs/gedit/depends
index be7a40ff4e4..13ec5d9828f 100644
--- a/srcpkgs/gedit/depends
+++ b/srcpkgs/gedit/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.2"
+abi_depends=">=2.91.7"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gedit/gedit-devel.template b/srcpkgs/gedit/gedit-devel.template
index 90f3bfe5ea0..19503a502c7 100644
--- a/srcpkgs/gedit/gedit-devel.template
+++ b/srcpkgs/gedit/gedit-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 glib-devel
+Add_dependency run libxml2-devel
+Add_dependency run gtksourceview-devel
+Add_dependency run libpeas-devel
+Add_dependency run gtk+3-devel
Add_dependency run atk-devel
Add_dependency run pango-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-devel
Add_dependency run cairo-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
-Add_dependency run gtk+-devel
-Add_dependency run GConf-devel
-Add_dependency run libxml2-devel
-Add_dependency run gtksourceview-devel
-Add_dependency run enchant-devel
+Add_dependency run libgirepository-devel
+Add_dependency run libffi-devel
Add_dependency run libX11-devel
+Add_dependency run glib-devel
+Add_dependency run enchant-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
-Add_dependency run pygtksourceview
-Add_dependency run gedit
do_install()
{
mkdir -p ${DESTDIR}/usr/{lib,share}
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ #mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/gedit/gir-1.0 ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 79630fe526d..105576fdca7 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,53 +1,58 @@
# Template file for 'gedit'
pkgname=gedit
-version=2.30.4
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/gedit/3.0/gedit-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --localstatedir=/var"
+configure_args="--disable-schemas-compile --disable-scrollkeeper"
short_desc="A text editor for GNOME"
maintainer="Juan RP "
-checksum=a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
+checksum=a3a14d2f239f43f043743bc526f89c84bfb1ce55096b7629f905947948959f5e
long_desc="
The GNOME Editor."
-
-gconf_schemas="gedit-file-browser.schemas gedit.schemas"
+
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+subpackages="gedit-devel"
Add_dependency run glibc
-Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run gtksourceview
+Add_dependency run libpeas
+Add_dependency run gtk+3
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 libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run libxml2
-Add_dependency run GConf
-Add_dependency run gtksourceview
-Add_dependency run enchant
+Add_dependency run libgirepository
+Add_dependency run libffi
Add_dependency run libX11
+Add_dependency run glib
+Add_dependency run enchant
Add_dependency run libSM
Add_dependency run libICE
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build gtksourceview-devel
+Add_dependency build libpeas-devel
+Add_dependency build gtk+3-devel
Add_dependency build atk-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 gtk+-devel
-Add_dependency build GConf-devel
-Add_dependency build libxml2-devel
-Add_dependency build gtksourceview-devel
-Add_dependency build enchant-devel
+Add_dependency build libgirepository-devel
+Add_dependency build libffi-devel
Add_dependency build libX11-devel
+Add_dependency build glib-devel
+Add_dependency build enchant-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
diff --git a/srcpkgs/geoclue-devel b/srcpkgs/geoclue-devel
new file mode 120000
index 00000000000..40487d3141f
--- /dev/null
+++ b/srcpkgs/geoclue-devel
@@ -0,0 +1 @@
+geoclue
\ No newline at end of file
diff --git a/srcpkgs/geoclue/depends b/srcpkgs/geoclue/depends
new file mode 100644
index 00000000000..f90b51d01a5
--- /dev/null
+++ b/srcpkgs/geoclue/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.12.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/geoclue/geoclue-devel.template b/srcpkgs/geoclue/geoclue-devel.template
new file mode 100644
index 00000000000..06ce92150d6
--- /dev/null
+++ b/srcpkgs/geoclue/geoclue-devel.template
@@ -0,0 +1,24 @@
+# Template file for 'geoclue-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 dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libxml2-devel
+Add_dependency run libsoup-devel
+Add_dependency run GConf-devel
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/{lib,share}
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template
new file mode 100644
index 00000000000..febcc7a3ee6
--- /dev/null
+++ b/srcpkgs/geoclue/template
@@ -0,0 +1,31 @@
+# Template file for 'geoclue'
+pkgname=geoclue
+version=0.12.0
+distfiles="http://folks.o-hand.com/jku/geoclue-releases/geoclue-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-networkmanager=no --enable-conic=no"
+short_desc="The Geoinformation Service"
+maintainer="Juan RP "
+checksum=0f533f177ae9aa35e807a01c754840f66df9579f5524552f14f2b5ba670a4696
+long_desc="
+ Geoclue is a modular geoinformation service built on top of the D-Bus
+ messaging system. The goal of the Geoclue project is to make creating
+ location-aware applications as simple as possible."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libxml2
+Add_dependency run libsoup
+Add_dependency run GConf
+
+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 libxml2-devel
+Add_dependency build libsoup-devel
+Add_dependency build GConf-devel
diff --git a/srcpkgs/gir-atk b/srcpkgs/gir-atk
deleted file mode 120000
index b9b776926fd..00000000000
--- a/srcpkgs/gir-atk
+++ /dev/null
@@ -1 +0,0 @@
-atk
\ No newline at end of file
diff --git a/srcpkgs/gir-babl b/srcpkgs/gir-babl
deleted file mode 120000
index 61658c2beeb..00000000000
--- a/srcpkgs/gir-babl
+++ /dev/null
@@ -1 +0,0 @@
-babl
\ No newline at end of file
diff --git a/srcpkgs/gir-brasero b/srcpkgs/gir-brasero
deleted file mode 120000
index 42b30b682de..00000000000
--- a/srcpkgs/gir-brasero
+++ /dev/null
@@ -1 +0,0 @@
-brasero
\ No newline at end of file
diff --git a/srcpkgs/gir-clutter b/srcpkgs/gir-clutter
deleted file mode 120000
index 5a89e25ad77..00000000000
--- a/srcpkgs/gir-clutter
+++ /dev/null
@@ -1 +0,0 @@
-clutter
\ No newline at end of file
diff --git a/srcpkgs/gir-dconf b/srcpkgs/gir-dconf
deleted file mode 120000
index 69f7f165c48..00000000000
--- a/srcpkgs/gir-dconf
+++ /dev/null
@@ -1 +0,0 @@
-dconf
\ No newline at end of file
diff --git a/srcpkgs/gir-epiphany b/srcpkgs/gir-epiphany
deleted file mode 120000
index ba4f157dc23..00000000000
--- a/srcpkgs/gir-epiphany
+++ /dev/null
@@ -1 +0,0 @@
-epiphany
\ No newline at end of file
diff --git a/srcpkgs/gir-gconf b/srcpkgs/gir-gconf
deleted file mode 120000
index cf3c511e781..00000000000
--- a/srcpkgs/gir-gconf
+++ /dev/null
@@ -1 +0,0 @@
-GConf
\ No newline at end of file
diff --git a/srcpkgs/gir-gdata b/srcpkgs/gir-gdata
deleted file mode 120000
index 29d228b2d74..00000000000
--- a/srcpkgs/gir-gdata
+++ /dev/null
@@ -1 +0,0 @@
-libgdata
\ No newline at end of file
diff --git a/srcpkgs/gir-gdk-pixbuf b/srcpkgs/gir-gdk-pixbuf
deleted file mode 120000
index fa20dc708aa..00000000000
--- a/srcpkgs/gir-gdk-pixbuf
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-panel b/srcpkgs/gir-gnome-panel
deleted file mode 120000
index 50c431b3109..00000000000
--- a/srcpkgs/gir-gnome-panel
+++ /dev/null
@@ -1 +0,0 @@
-gnome-panel
\ No newline at end of file
diff --git a/srcpkgs/gir-gssdp b/srcpkgs/gir-gssdp
deleted file mode 120000
index c0eeeda87fd..00000000000
--- a/srcpkgs/gir-gssdp
+++ /dev/null
@@ -1 +0,0 @@
-gssdp
\ No newline at end of file
diff --git a/srcpkgs/gir-gst-plugins-base b/srcpkgs/gir-gst-plugins-base
deleted file mode 120000
index 1f1773adbaf..00000000000
--- a/srcpkgs/gir-gst-plugins-base
+++ /dev/null
@@ -1 +0,0 @@
-gst-plugins-base
\ No newline at end of file
diff --git a/srcpkgs/gir-gstreamer b/srcpkgs/gir-gstreamer
deleted file mode 120000
index 037f2c49071..00000000000
--- a/srcpkgs/gir-gstreamer
+++ /dev/null
@@ -1 +0,0 @@
-gstreamer
\ No newline at end of file
diff --git a/srcpkgs/gir-gtk+ b/srcpkgs/gir-gtk+
deleted file mode 120000
index 50dbbf5fe75..00000000000
--- a/srcpkgs/gir-gtk+
+++ /dev/null
@@ -1 +0,0 @@
-gtk+
\ No newline at end of file
diff --git a/srcpkgs/gir-gtk+3 b/srcpkgs/gir-gtk+3
deleted file mode 120000
index 6dc54ba3851..00000000000
--- a/srcpkgs/gir-gtk+3
+++ /dev/null
@@ -1 +0,0 @@
-gtk+3
\ No newline at end of file
diff --git a/srcpkgs/gir-gudev b/srcpkgs/gir-gudev
deleted file mode 120000
index b95ad750c43..00000000000
--- a/srcpkgs/gir-gudev
+++ /dev/null
@@ -1 +0,0 @@
-udev
\ No newline at end of file
diff --git a/srcpkgs/gir-gupnp b/srcpkgs/gir-gupnp
deleted file mode 120000
index 6061f466778..00000000000
--- a/srcpkgs/gir-gupnp
+++ /dev/null
@@ -1 +0,0 @@
-gupnp
\ No newline at end of file
diff --git a/srcpkgs/gir-json-glib b/srcpkgs/gir-json-glib
deleted file mode 120000
index f6ab71b1c5b..00000000000
--- a/srcpkgs/gir-json-glib
+++ /dev/null
@@ -1 +0,0 @@
-json-glib
\ No newline at end of file
diff --git a/srcpkgs/gir-libsoup b/srcpkgs/gir-libsoup
deleted file mode 120000
index ed1af3c9d38..00000000000
--- a/srcpkgs/gir-libsoup
+++ /dev/null
@@ -1 +0,0 @@
-libsoup
\ No newline at end of file
diff --git a/srcpkgs/gir-libunique b/srcpkgs/gir-libunique
deleted file mode 120000
index a4f4bebbc83..00000000000
--- a/srcpkgs/gir-libunique
+++ /dev/null
@@ -1 +0,0 @@
-libunique
\ No newline at end of file
diff --git a/srcpkgs/gir-libwnck b/srcpkgs/gir-libwnck
deleted file mode 120000
index f1e1ba2a202..00000000000
--- a/srcpkgs/gir-libwnck
+++ /dev/null
@@ -1 +0,0 @@
-libwnck
\ No newline at end of file
diff --git a/srcpkgs/gir-lightdm b/srcpkgs/gir-lightdm
deleted file mode 120000
index af96b29785e..00000000000
--- a/srcpkgs/gir-lightdm
+++ /dev/null
@@ -1 +0,0 @@
-lightdm
\ No newline at end of file
diff --git a/srcpkgs/gir-nautilus b/srcpkgs/gir-nautilus
deleted file mode 120000
index 9f0175d681c..00000000000
--- a/srcpkgs/gir-nautilus
+++ /dev/null
@@ -1 +0,0 @@
-nautilus
\ No newline at end of file
diff --git a/srcpkgs/gir-pango b/srcpkgs/gir-pango
deleted file mode 120000
index f23a548cc82..00000000000
--- a/srcpkgs/gir-pango
+++ /dev/null
@@ -1 +0,0 @@
-pango
\ No newline at end of file
diff --git a/srcpkgs/gir-polkit b/srcpkgs/gir-polkit
deleted file mode 120000
index 3b45280441e..00000000000
--- a/srcpkgs/gir-polkit
+++ /dev/null
@@ -1 +0,0 @@
-polkit
\ No newline at end of file
diff --git a/srcpkgs/gir-polkit-gnome b/srcpkgs/gir-polkit-gnome
deleted file mode 120000
index ab161b4d14c..00000000000
--- a/srcpkgs/gir-polkit-gnome
+++ /dev/null
@@ -1 +0,0 @@
-polkit-gnome
\ No newline at end of file
diff --git a/srcpkgs/gir-seahorse b/srcpkgs/gir-seahorse
deleted file mode 120000
index b9ddbd7d018..00000000000
--- a/srcpkgs/gir-seahorse
+++ /dev/null
@@ -1 +0,0 @@
-seahorse
\ No newline at end of file
diff --git a/srcpkgs/gir-totem-pl-parser b/srcpkgs/gir-totem-pl-parser
deleted file mode 120000
index e94521bbd10..00000000000
--- a/srcpkgs/gir-totem-pl-parser
+++ /dev/null
@@ -1 +0,0 @@
-totem-pl-parser
\ No newline at end of file
diff --git a/srcpkgs/gir-upower b/srcpkgs/gir-upower
deleted file mode 120000
index 9df007da7f1..00000000000
--- a/srcpkgs/gir-upower
+++ /dev/null
@@ -1 +0,0 @@
-upower
\ No newline at end of file
diff --git a/srcpkgs/gir-webkit-gtk b/srcpkgs/gir-webkit-gtk
deleted file mode 120000
index dd01fa7988c..00000000000
--- a/srcpkgs/gir-webkit-gtk
+++ /dev/null
@@ -1 +0,0 @@
-webkit-gtk
\ No newline at end of file
diff --git a/srcpkgs/gjs-devel b/srcpkgs/gjs-devel
new file mode 120000
index 00000000000..e378d50e7fd
--- /dev/null
+++ b/srcpkgs/gjs-devel
@@ -0,0 +1 @@
+gjs
\ No newline at end of file
diff --git a/srcpkgs/gjs/depends b/srcpkgs/gjs/depends
new file mode 100644
index 00000000000..d18f9b64264
--- /dev/null
+++ b/srcpkgs/gjs/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.7.11"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gjs/gjs-devel.template b/srcpkgs/gjs/gjs-devel.template
new file mode 100644
index 00000000000..ca556a6328c
--- /dev/null
+++ b/srcpkgs/gjs/gjs-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'gjs-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
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
new file mode 100644
index 00000000000..c8aac52809a
--- /dev/null
+++ b/srcpkgs/gjs/template
@@ -0,0 +1,40 @@
+# Template file for 'gjs'
+pkgname=gjs
+version=0.7.14
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="Mozilla-based javascript bindings for the GNOME platform"
+maintainer="Juan RP "
+checksum=3af6f449a505c419d4a0e5938737da8d1b9b09b33710cc1ac1edee2eaa86e348
+long_desc="
+ Makes it possible for applications to use all of GNOME's platform libraries
+ using the Javascript language. It's mainly based on the Mozilla javascript
+ engine and the GObject introsepection framework."
+
+subpackages="gjs-devel"
+
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run glib
+Add_dependency run libffi
+Add_dependency run libgirepository
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run cairo
+Add_dependency run readline
+Add_dependency run nspr
+Add_dependency run xulrunner
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build libffi-devel
+Add_dependency build libgirepository-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build cairo-devel
+Add_dependency build readline-devel
+Add_dependency build nspr-devel
+Add_dependency build xulrunner-devel
diff --git a/srcpkgs/glib-networking/depends b/srcpkgs/glib-networking/depends
new file mode 100644
index 00000000000..a3fd0750ce2
--- /dev/null
+++ b/srcpkgs/glib-networking/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.27.5"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
new file mode 100644
index 00000000000..24c1db6b687
--- /dev/null
+++ b/srcpkgs/glib-networking/template
@@ -0,0 +1,28 @@
+# Template file for 'glib-networking'
+pkgname=glib-networking
+version=2.28.5
+distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-static --without-ca-certificates"
+short_desc="Network-related giomodules for glib"
+maintainer="Juan RP "
+checksum=959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876
+long_desc="
+ This package contains GLib's GIO modules for networking."
+
+triggers="gio-modules"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libproxy
+Add_dependency run libgpg-error
+Add_dependency run libgcrypt
+Add_dependency run gnutls
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build libproxy-devel
+Add_dependency build libgpg-error-devel
+Add_dependency build libgcrypt-devel
+Add_dependency build gnutls-devel
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index a9d5cb9a069..a274db082ed 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,12 +1,12 @@
# Template build file for 'glib'
pkgname=glib
-version=2.28.1
+version=2.28.4
distfiles="${GNOME_SITE}/glib/2.28/glib-$version.tar.bz2"
configure_args="--disable-fam --with-pcre=system"
build_style=gnu_configure
short_desc="The GNU library of C routines"
maintainer="Juan RP "
-checksum=1b85b998909202c07c2def66613ae6736aac48d7a0a7c98f98967b936fe9de22
+checksum=ae627cf35c6a2b4bb9b0ea624046de5fa4c40d81c29e75718bc6c2088b6bd7a1
long_desc="
GLib is a library containing many useful C routines for things such
as trees, hashes, lists and strings. It is a useful general purpose
@@ -20,8 +20,3 @@ Add_dependency build gettext
Add_dependency build pkg-config
Add_dependency build zlib-devel
Add_dependency build pcre-devel
-
-post_install()
-{
- chmod 644 ${DESTDIR}/etc/bash_completion.d/*.sh
-}
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 061de0a6954..51c8845fcc9 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -1,11 +1,11 @@
# Template build file for 'glibmm'
pkgname=glibmm
-version=2.24.2
-distfiles="${GNOME_SITE}/glibmm/2.24/glibmm-$version.tar.bz2"
+version=2.27.99
+distfiles="${GNOME_SITE}/glibmm/2.27/glibmm-$version.tar.bz2"
build_style=gnu_configure
short_desc="C++ bindings for GLib"
maintainer="Juan RP "
-checksum=d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a
+checksum=d079bb42fa378dc88a9e964274b05f222d243b44eaaa85a04893a9bb85459194
long_desc="
glibmm (previously known as GLib--) is the official C++ interface for the
popular GUI library GTK+. Highlights include typesafe callbacks, widgets
diff --git a/srcpkgs/gnome-applets/template b/srcpkgs/gnome-applets/template
deleted file mode 100644
index 6ad3326741e..00000000000
--- a/srcpkgs/gnome-applets/template
+++ /dev/null
@@ -1,111 +0,0 @@
-# Template file for 'gnome-applets'
-pkgname=gnome-applets
-version=2.32.0
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.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
---enable-mixer-applet --disable-scrollkeeper --without-hal
---enable-ipv6 --enable-polkit --enable-networkmanager
---enable-mini-commander"
-short_desc="GNOME panel applets"
-maintainer="Juan RP "
-checksum=3b2611b3253ed5418f37c83d710918e93476a783637ddb4ef7e5eab7a83a4c1b
-long_desc="
- This package contains the panel applets for the GNOME desktop. The applets
- are a set of small utilities that run from within Gnome panels."
-
-gconf_schemas="
-battstat.schemas
-charpick.schemas
-cpufreq-applet.schemas
-drivemount.schemas
-geyes.schemas
-mini-commander-global.schemas
-mini-commander.schemas
-mixer.schemas
-multiload.schemas
-stickynotes.schemas"
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-Add_dependency run glibc
-Add_dependency run popt
-Add_dependency run libart
-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 libbonobo
-Add_dependency run ORBit2
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run libX11
-Add_dependency run gucharmap
-Add_dependency run libwnck
-Add_dependency run libxml2
-Add_dependency run libcpufreq
-Add_dependency run dbus-glib
-Add_dependency run gst-plugins-base
-Add_dependency run gstreamer
-Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run libnotify
-Add_dependency run dbus-libs
-Add_dependency run libgweather
-Add_dependency run libgtop
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run polkit
-Add_dependency run gnome-panel
-Add_dependency run GConf
-Add_dependency run NetworkManager
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gnome-panel-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-devel
-Add_dependency build gdk-pixbuf-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 libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build gucharmap-devel
-Add_dependency build libwnck-devel
-Add_dependency build libxml2-devel
-Add_dependency build libcpufreq-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gst-plugins-base-devel
-Add_dependency build gstreamer-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-devel
-Add_dependency build libgweather-devel
-Add_dependency build libgtop-devel
-Add_dependency build polkit-devel
-Add_dependency build NetworkManager-devel
-
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index d3782f0480e..29d7d9b9823 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Set of background images for the GNOME Desktop"
maintainer="Juan RP "
-checksum=4d7b60b5ba768bf8834b5fa3a3471cd9a9e14b5884bc210dc2d3cdbf1faddcef
+checksum=c1071ec9234e64a924babb43475ba0c7d74973426719eccf043e4e96aabed4c7
long_desc="
This package provides a set of background images ready to be used within the
GNOME Desktop."
diff --git a/srcpkgs/gnome-bluetooth/depends b/srcpkgs/gnome-bluetooth/depends
index 6a11fcf61de..2d37375f920 100644
--- a/srcpkgs/gnome-bluetooth/depends
+++ b/srcpkgs/gnome-bluetooth/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.32.0"
+abi_depends=">=2.91.5"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
index 203c404c543..af383c00e07 100644
--- a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
+++ b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
@@ -8,24 +8,28 @@ long_desc="${long_desc}
Add_dependency run pkg-config
Add_dependency run intltool
Add_dependency run gnome-doc-utils
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
Add_dependency run glib-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-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 GConf-devel
+Add_dependency run libbluetooth-devel
+Add_dependency run gtk+3-devel
Add_dependency run libunique-devel
Add_dependency run libnotify-devel
-Add_dependency run libbluetooth-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-control-center-devel
+Add_dependency run gnome-bluetooth
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
}
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index f8c1e5e017c..2b71f033ce7 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,15 +1,13 @@
# Template file for 'gnome-bluetooth'
pkgname=gnome-bluetooth
-version=2.32.0
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-desktop-update --disable-nautilus-sendto
---localstatedir=/var --disable-icon-update --disable-scrollkeeper
---disable-introspection --disable-schemas-compile"
+configure_args="--disable-desktop-update --disable-schemas-compile
+--localstatedir=/var --disable-icon-update --disable-scrollkeeper"
short_desc="The GNOME Bluetooth Subsystem"
maintainer="Juan RP "
-checksum=57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973
+checksum=bdfa7986b8b7f622b48a70b29a48016482190d240de499da5d7fddb48ed4c211
long_desc="
This package contains tools for managing and manipulating Bluetooth devices
using the GNOME desktop.
@@ -24,44 +22,46 @@ triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="$pkgname-devel"
-# XXX: add gobject-introspection and nautilus-sendto support.
Add_dependency run glibc
-Add_dependency run dbus-glib
Add_dependency run dbus-libs
+Add_dependency run dbus-glib
Add_dependency run gdk-pixbuf
Add_dependency run libpng
-Add_dependency run GConf
-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 gtk+3
Add_dependency run libunique
Add_dependency run libnotify
+Add_dependency run GConf
+Add_dependency run gnome-control-center
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build dbus-glib-devel
+Add_dependency build glib-devel
Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build libpng-devel
-Add_dependency build GConf-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 libbluetooth-devel
+Add_dependency build gtk+3-devel
Add_dependency build libunique-devel
Add_dependency build libnotify-devel
-Add_dependency build libbluetooth-devel
+Add_dependency build GConf-devel
+Add_dependency build gnome-control-center-devel
+Add_dependency build nautilus-sendto-devel
-Add_dependency full bluez
+Add_dependency full bluez ">=0"
Add_dependency full gvfs
-Add_dependency full obexd
+Add_dependency full obexd ">=0"
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-control-center/depends b/srcpkgs/gnome-control-center/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/gnome-control-center/depends
+++ b/srcpkgs/gnome-control-center/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-control-center/gnome-control-center-devel.template b/srcpkgs/gnome-control-center/gnome-control-center-devel.template
index 1b4eb85994f..c7945fb6a01 100644
--- a/srcpkgs/gnome-control-center/gnome-control-center-devel.template
+++ b/srcpkgs/gnome-control-center/gnome-control-center-devel.template
@@ -1,48 +1,17 @@
# Template file for 'gnome-control-center-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."
Add_dependency run pkg-config
Add_dependency run intltool
-Add_dependency run gnome-doc-utils
-Add_dependency run GConf-devel
-Add_dependency run libxml2-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run gtk+-devel
-Add_dependency run startup-notification-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 gnome-menus-devel
-Add_dependency run libSM-devel
-Add_dependency run libICE-devel
-Add_dependency run libX11-devel
-Add_dependency run metacity-devel
-Add_dependency run libXcursor-devel
-Add_dependency run libXi-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run libXft-devel
-Add_dependency run libXrender-devel
-Add_dependency run libunique-devel
-Add_dependency run librsvg-devel
-Add_dependency run evolution-data-server-devel
-Add_dependency run libsoup-devel
-Add_dependency run libgnomekbd-devel
-Add_dependency run libxklavier-devel
do_install()
{
- mkdir -p ${DESTDIR}/usr/lib/window-manager-settings
+ 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/lib/window-manager-settings/*.a \
- ${DESTDIR}/usr/lib/window-manager-settings
+ #mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 11cb0d79361..442abed5bea 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,29 +1,27 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0.1
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --disable-update-mimedb --enable-aboutme"
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-cups
+--localstatedir=/var --disable-update-mimedb --disable-static"
short_desc="GNOME control center"
maintainer="Juan RP "
-checksum=7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
+checksum=9f3e95ba559d73cfe714d4dbc7ac70a342cfd9999d506552b79f9e61a171e1d9
long_desc="
This packages the control center for the GNOME desktop."
-gconf_schemas="control-center.schemas fontilus.schemas $pkgname.schemas"
+gconf_schemas="$pkgname.schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="$pkgname-devel"
triggers="mimedb"
Add_dependency run glibc
-Add_dependency run GConf
Add_dependency run libxml2
Add_dependency run gnome-desktop
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run libX11
+Add_dependency run gtk+3
Add_dependency run startup-notification
Add_dependency run atk
Add_dependency run glib
@@ -31,30 +29,28 @@ Add_dependency run pango
Add_dependency run cairo
Add_dependency run freetype
Add_dependency run fontconfig
-Add_dependency run gnome-menus
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run libX11
-Add_dependency run metacity
-Add_dependency run libXcursor
-Add_dependency run libXi
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+Add_dependency run upower
Add_dependency run dbus-glib
-Add_dependency run libXft
-Add_dependency run libunique
-Add_dependency run librsvg
-Add_dependency run evolution-data-server
+Add_dependency run dbus-libs
+Add_dependency run libXi
Add_dependency run libgnomekbd
Add_dependency run libxklavier
-Add_dependency run sqlite
+Add_dependency run GConf
+Add_dependency run libgtop
+Add_dependency run libcanberra
+Add_dependency run libpulseaudio
+Add_dependency run polkit
+Add_dependency run gnome-menus
+Add_dependency run NetworkManager
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build GConf-devel
Add_dependency build libxml2-devel
Add_dependency build gnome-desktop-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build startup-notification-devel
Add_dependency build atk-devel
Add_dependency build glib-devel
@@ -62,21 +58,21 @@ Add_dependency build pango-devel
Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build gnome-menus-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build metacity-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXi-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build libpng-devel
+Add_dependency build upower-devel
Add_dependency build dbus-glib-devel
-Add_dependency build libXft-devel
-Add_dependency build libunique-devel
-Add_dependency build librsvg-devel
-Add_dependency build evolution-data-server-devel
+Add_dependency build dbus-devel
+Add_dependency build libXi-devel
Add_dependency build libgnomekbd-devel
Add_dependency build libxklavier-devel
-Add_dependency build gnome-settings-daemon
+Add_dependency build GConf-devel
+Add_dependency build libgtop-devel
+Add_dependency build libcanberra-devel
+Add_dependency build pulseaudio-devel
+Add_dependency build polkit-devel
+Add_dependency build gnome-menus-devel
+Add_dependency build NetworkManager-devel
Add_dependency full desktop-file-utils
Add_dependency full hicolor-icon-theme
@@ -85,4 +81,8 @@ post_install()
{
rm -f ${DESTDIR}//usr/share/applications/mimeinfo.cache
mv ${DESTDIR}/usr/share/pkgconfig/* ${DESTDIR}/usr/lib/pkgconfig
+
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname}-2.0 ${wrksrc}/*.schemas
}
diff --git a/srcpkgs/gnome-desktop/depends b/srcpkgs/gnome-desktop/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/gnome-desktop/depends
+++ b/srcpkgs/gnome-desktop/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-desktop/gnome-desktop-devel.template b/srcpkgs/gnome-desktop/gnome-desktop-devel.template
index 23c81c17b7a..9823514a0e7 100644
--- a/srcpkgs/gnome-desktop/gnome-desktop-devel.template
+++ b/srcpkgs/gnome-desktop/gnome-desktop-devel.template
@@ -27,5 +27,5 @@ do_install()
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/gtk-doc ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index fa224b3c756..188c82568f7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --with-gnome-distributor=XBPS
--disable-scrollkeeper"
short_desc="GNOME desktop management utilities"
maintainer="Juan RP "
-checksum=55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
+checksum=daa46b85e17dad57bbce1f99e1ad4fd2195fea3d91ba8fdf49d2d3f9badeba69
long_desc="
gnome-desktop provides the following components:
@@ -17,36 +17,37 @@ long_desc="
* The GNOME desktop manager proxy, which handles basic desktop
management for applications that do not support XSM."
+triggers="gsettings-schemas"
subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
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 startup-notification
Add_dependency run libX11
Add_dependency run libXrandr
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run gtk+
-Add_dependency run GConf
-Add_dependency run startup-notification
+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 libX11-devel
+Add_dependency build gtk+3-devel
Add_dependency build atk-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 libX11-devel
-Add_dependency build libXrandr-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
-Add_dependency build GConf-devel
+Add_dependency build glib-devel
Add_dependency build startup-notification-devel
-Add_dependency full pygtk
+Add_dependency build libXrandr-devel
+
+Add_dependency full gsettings-desktop-schemas
diff --git a/srcpkgs/gnome-disk-utility/depends b/srcpkgs/gnome-disk-utility/depends
index e709dcbad4e..0edbddbd1a9 100644
--- a/srcpkgs/gnome-disk-utility/depends
+++ b/srcpkgs/gnome-disk-utility/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.1"
+abi_depends=">=2.91.6"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template b/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template
index 96908bfbf1d..8f77ff66c4a 100644
--- a/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template
+++ b/srcpkgs/gnome-disk-utility/gnome-disk-utility-devel.template
@@ -8,31 +8,31 @@ long_desc="${long_desc}
Add_dependency run pkg-config
Add_dependency run intltool
Add_dependency run gnome-doc-utils
-Add_dependency run glib-devel
Add_dependency run dbus-glib-devel
Add_dependency run dbus-devel
Add_dependency run libgnome-keyring-devel
Add_dependency run libatasmart-devel
Add_dependency run avahi-ui-libs-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run gtk+-devel
Add_dependency run avahi-libs-devel
Add_dependency run avahi-glib-libs-devel
+Add_dependency run nautilus-devel
+Add_dependency run gtk+3-devel
Add_dependency run atk-devel
+Add_dependency run glib-devel
Add_dependency run pango-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-devel
Add_dependency run cairo-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
-Add_dependency run libnotify-devel
Add_dependency run libunique-devel
Add_dependency run libX11-devel
-Add_dependency run udisks
+Add_dependency run libnotify-devel
Add_dependency run gnome-disk-utility
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index cbdcb14da6a..2bcb77c8dec 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-scrollkeeper --disable-gtk-doc
---localstatedir=/var --disable-nautilus"
+--disable-static --localstatedir=/var"
short_desc="GNOME common librares"
maintainer="Juan RP "
-checksum=03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98
+checksum=94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb
long_desc="
This packages common libraries for the GNOME desktop."
@@ -16,47 +16,50 @@ subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libgnome-keyring
-Add_dependency run libatasmart
-Add_dependency run avahi-ui-libs
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-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 libnotify
-Add_dependency run libunique
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
Add_dependency run libX11
+Add_dependency run gtk+3
+Add_dependency run avahi-libs
+Add_dependency run avahi-glib-libs
+Add_dependency run avahi-ui-libs-gtk3
+Add_dependency run libatasmart
+Add_dependency run libunique
+Add_dependency run libnotify
+Add_dependency run nautilus
+Add_dependency run libgnome-keyring
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build glib-devel
Add_dependency build dbus-glib-devel
Add_dependency build dbus-devel
Add_dependency build libgnome-keyring-devel
Add_dependency build libatasmart-devel
Add_dependency build avahi-ui-libs-devel
-Add_dependency build libpng-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
Add_dependency build avahi-libs-devel
Add_dependency build avahi-glib-libs-devel
+Add_dependency build nautilus-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 libnotify-devel
Add_dependency build libunique-devel
Add_dependency build libX11-devel
+Add_dependency build libnotify-devel
Add_dependency full udisks
Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-icon-theme-extras/template b/srcpkgs/gnome-icon-theme-extras/template
index 5052f6657b8..252a5fb6600 100644
--- a/srcpkgs/gnome-icon-theme-extras/template
+++ b/srcpkgs/gnome-icon-theme-extras/template
@@ -1,11 +1,11 @@
# Template build file for 'gnome-icon-theme-extras'.
pkgname=gnome-icon-theme-extras
-version=2.30.1
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="GNOME Desktop icon theme (additional icons)"
maintainer="Juan RP "
-checksum=45db58ca52765b40a4a22bc8d70d05564c94697d252b8941bb5be76315f6508b
+checksum=b9e4af7cb9cce3123da257f70223ee3fd78e0963a040386aaef449b111f862eb
long_desc="
This package contains the default icon theme used by the GNOME desktop.
The icons are used in the panel menu, and in nautilus and other applications,
diff --git a/srcpkgs/gnome-icon-theme-symbolic/template b/srcpkgs/gnome-icon-theme-symbolic/template
new file mode 100644
index 00000000000..464d9b8d5d6
--- /dev/null
+++ b/srcpkgs/gnome-icon-theme-symbolic/template
@@ -0,0 +1,22 @@
+# Template build file for 'gnome-icon-theme-symbolic'.
+pkgname=gnome-icon-theme-symbolic
+version=2.91.93
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="GNOME Desktop icon theme (symbolic icons)"
+maintainer="Juan RP "
+checksum=5bc947dff7927bd6aa679f77d3bb8b6bf96ac6fd0bd16d782aeecb70f9d62986
+long_desc="
+ This package contains the default icon theme used by the GNOME desktop.
+ The icons are used in the panel menu, and in nautilus and other applications,
+ to represent the different applications, files, directories, and devices.
+
+ This package contains symbolic cons for the default GNOME icon theme."
+
+noarch=yes
+gtk_iconcache_dirs="/usr/share/icons/gnome"
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build icon-naming-utils
+Add_dependency full gnome-icon-theme
diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template
index 6b38a29255c..e0e04572c05 100644
--- a/srcpkgs/gnome-icon-theme/template
+++ b/srcpkgs/gnome-icon-theme/template
@@ -1,11 +1,11 @@
# Template build file for 'gnome-icon-theme'.
pkgname=gnome-icon-theme
-version=2.31.0
-distfiles="${GNOME_SITE}/$pkgname/2.31/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Theme consisting of a set of icons for GNOME"
maintainer="Juan RP "
-checksum=ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982
+checksum=42da7c4ab1521e7beb1c26f5588c35a644ef57585754d8ceec427d9d7f94bb09
long_desc="
This package contains a set of icons forming the default icon theme
for GNOME."
diff --git a/srcpkgs/gnome-keyring/depends b/srcpkgs/gnome-keyring/depends
index 071d27b792a..ab0d9627ad7 100644
--- a/srcpkgs/gnome-keyring/depends
+++ b/srcpkgs/gnome-keyring/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=3.0.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-keyring/gnome-keyring-devel.template b/srcpkgs/gnome-keyring/gnome-keyring-devel.template
index afe292a0396..568307b6f0e 100644
--- a/srcpkgs/gnome-keyring/gnome-keyring-devel.template
+++ b/srcpkgs/gnome-keyring/gnome-keyring-devel.template
@@ -12,14 +12,13 @@ Add_dependency run glib-devel
Add_dependency run libgcrypt-devel
Add_dependency run libgpg-error-devel
Add_dependency run libtasn1-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 dbus-devel
-Add_dependency run GConf-devel
+Add_dependency run gtk+3-devel
Add_dependency run gnome-keyring
do_install()
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index f885795e7a0..b274997314e 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,14 +1,13 @@
# Template file for 'gnome-keyring'
pkgname=gnome-keyring
-version=2.32.1
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --with-pam-dir=/lib/security
---with-root-certs=/etc/ssl/certs"
+--without-root-certs --with-gtk=3.0 --disable-schemas-compile"
short_desc="GNOME password and secret manager"
maintainer="Juan RP "
-checksum=31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
+checksum=63bbe53031620d8514cf4ebd7705e2360d37679e785c4588f66b88f919e56c20
long_desc="
gnome-keyring is a program that keeps passwords and other secrets for
users. It is run as a damon in the session, similar to ssh-agent, and
@@ -33,8 +32,9 @@ 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 pam
+Add_dependency run libcap
Add_dependency build pkg-config
Add_dependency build intltool
@@ -42,7 +42,6 @@ Add_dependency build glib-devel
Add_dependency build dbus-devel
Add_dependency build glibc-devel
Add_dependency build libgcrypt-devel
-Add_dependency build gtk+-devel
Add_dependency build libgpg-error-devel
Add_dependency build atk-devel
Add_dependency build pango-devel
@@ -52,5 +51,7 @@ Add_dependency build libpng-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build pam-devel
+Add_dependency build gtk+3-devel
+Add_dependency build libcap-devel
Add_dependency full dconf
diff --git a/srcpkgs/gnome-media-devel b/srcpkgs/gnome-media-devel
deleted file mode 120000
index ea2275f8544..00000000000
--- a/srcpkgs/gnome-media-devel
+++ /dev/null
@@ -1 +0,0 @@
-gnome-media
\ No newline at end of file
diff --git a/srcpkgs/gir-gnome-menus b/srcpkgs/gnome-menus-python
similarity index 100%
rename from srcpkgs/gir-gnome-menus
rename to srcpkgs/gnome-menus-python
diff --git a/srcpkgs/gnome-menus/depends b/srcpkgs/gnome-menus/depends
index 071d27b792a..0edbddbd1a9 100644
--- a/srcpkgs/gnome-menus/depends
+++ b/srcpkgs/gnome-menus/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.6"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-menus/gir-gnome-menus.template b/srcpkgs/gnome-menus/gir-gnome-menus.template
deleted file mode 100644
index fe919907dc4..00000000000
--- a/srcpkgs/gnome-menus/gir-gnome-menus.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gnome-menus'.
-#
-short_desc="GMenu introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GMenu in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gnome-menus
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-menus/gnome-menus-devel.template b/srcpkgs/gnome-menus/gnome-menus-devel.template
index f90ec9ef3e9..64c3ee10203 100644
--- a/srcpkgs/gnome-menus/gnome-menus-devel.template
+++ b/srcpkgs/gnome-menus/gnome-menus-devel.template
@@ -17,7 +17,6 @@ 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
}
diff --git a/srcpkgs/gnome-menus/gnome-menus-python.template b/srcpkgs/gnome-menus/gnome-menus-python.template
new file mode 100644
index 00000000000..3119179e499
--- /dev/null
+++ b/srcpkgs/gnome-menus/gnome-menus-python.template
@@ -0,0 +1,21 @@
+# Template file for 'gnome-menus-python'.
+#
+short_desc="${short_desc} - python bindings"
+long_desc="${long_desc}
+
+ This package contains the Python language bindings."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run python
+Add_dependency run pygtk
+Add_dependency run gnome-menus
+Add_dependency run desktop-file-utils
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/{bin,lib,share}
+ mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/share/applications ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index 19e0e94ff05..ae950744827 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -1,22 +1,21 @@
# Template file for 'gnome-menus'
pkgname=gnome-menus
-version=2.30.5
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--localstatedir=/var"
+configure_args="--localstatedir=/var --disable-static"
short_desc="GNOME menu specifications"
maintainer="Juan RP "
-checksum=6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
+checksum=4a92233c2f6ce0e5e484ddee33e01ae12b33133651ce486a4d944fd358de8f3b
long_desc="
This package provides an implementation of the Desktop Menu Specification
for the GNOME Desktop."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-python $pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
-Add_dependency run python
-Add_dependency run pygtk
+
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gobject-introspection
diff --git a/srcpkgs/gnome-netstatus/template b/srcpkgs/gnome-netstatus/template
deleted file mode 100644
index 69e5637bbc1..00000000000
--- a/srcpkgs/gnome-netstatus/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'gnome-netstatus'
-pkgname=gnome-netstatus
-version=2.28.2
-distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
-short_desc="Network status applet for GNOME"
-maintainer="Juan RP "
-checksum=d1ad0a668a1344898d4f47b5591adddc7791edb6c2e92136ebcf8d278d959119
-long_desc="
- GNOME panel applet that monitors network interfaces. Network Monitor provides
- indicators for ingoing and outgoing data, packets received and transmitted,
- and information about the network interface itself such as IP information and
- Ethernet address."
-
-gconf_schemas="netstatus.schemas"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-Add_dependency run glibc
-Add_dependency run gnome-panel
-Add_dependency run GConf
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-Add_dependency run libbonobo
-Add_dependency run ORBit2
-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 build pkg-config
-Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build gnome-panel-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-devel
-Add_dependency build libbonobo-devel
-Add_dependency build ORBit2-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 full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-panel/depends b/srcpkgs/gnome-panel/depends
index 071d27b792a..22be011a74a 100644
--- a/srcpkgs/gnome-panel/depends
+++ b/srcpkgs/gnome-panel/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.91"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-panel/gir-gnome-panel.template b/srcpkgs/gnome-panel/gir-gnome-panel.template
deleted file mode 100644
index bc86c5b3cb1..00000000000
--- a/srcpkgs/gnome-panel/gir-gnome-panel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gnome-panel'.
-#
-short_desc="Introspection data for GNOME panel"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- panel libraries."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template
index a5d2798844c..11d3a0cb5c9 100644
--- a/srcpkgs/gnome-panel/gnome-panel-devel.template
+++ b/srcpkgs/gnome-panel/gnome-panel-devel.template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel-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."
@@ -8,51 +8,37 @@ long_desc="${long_desc}
Add_dependency run pkg-config
Add_dependency run intltool
Add_dependency run gnome-doc-utils
-Add_dependency run libbonoboui-devel
-Add_dependency run libgnomecanvas-devel
-Add_dependency run libgnome-devel
-Add_dependency run popt-devel
-Add_dependency run libart-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 libbonobo-devel
-Add_dependency run ORBit2-devel
-Add_dependency run GConf-devel
-Add_dependency run libX11-devel
-Add_dependency run libXau-devel
-Add_dependency run libwnck-devel
-Add_dependency run evolution-data-server-devel
-Add_dependency run libical-devel
-Add_dependency run libxml2-devel
-Add_dependency run libsoup-devel
-Add_dependency run librsvg-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run startup-notification-devel
-Add_dependency run polkit-devel
-Add_dependency run dbus-devel
-Add_dependency run libgweather-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
+Add_dependency run gnome-desktop-devel
+Add_dependency run GConf-devel
Add_dependency run gnome-menus-devel
-Add_dependency run libcanberra-devel
+Add_dependency run gtk+3-devel
+Add_dependency run atk-devel
+Add_dependency run glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run cairo-devel
+Add_dependency run pango-devel
+Add_dependency run dbus-glib-devel
Add_dependency run libXrandr-devel
-Add_dependency run gnome-panel
+Add_dependency run libX11-devel
+Add_dependency run evolution-data-server-devel
+Add_dependency run libical-devel
+Add_dependency run librsvg-devel
+Add_dependency run dbus-devel
+Add_dependency run libgweather-devel
+Add_dependency run libwnck-devel
+Add_dependency run libpng-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libXau-devel
do_install()
{
- install -d ${DESTDIR}/usr/lib/gnome-panel/modules
- install -d ${DESTDIR}/usr/share
+ install -d ${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*,idl,gtk-doc} ${DESTDIR}/usr/share
- mv ${SRCPKGDESTDIR}/usr/lib/gnome-panel/modules/*.a \
- ${DESTDIR}/usr/lib/gnome-panel/modules
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index bb0596cd63c..ce33414efe0 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,118 +1,100 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0.1
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
--localstatedir=/var --enable-eds=auto"
short_desc="GNOME Panel"
maintainer="Juan RP "
-checksum=8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
+checksum=2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b
long_desc="
- This packages common libraries for the GNOME desktop."
+ This packages the GNOME panel."
gconf_schemas="
+panel-compatibility.schemas
+panel-global.schemas
+panel-general.schemas
+panel-toplevel.schemas
+panel-object.schemas
clock.schemas
fish.schemas
-panel-compatibility.schemas
-panel-general.schemas
-panel-global.schemas
-panel-object.schemas
-panel-toplevel.schemas
-window-list.schemas
-workspace-switcher.schemas"
+workspace-switcher.schemas
+window-list.schemas"
-gconf_entries="panel-default-setup.entries"
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-Add_dependency run gtk+
-Add_dependency run atk
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
Add_dependency run glib
+Add_dependency run atk
Add_dependency run pango
Add_dependency run cairo
+Add_dependency run libpng
+Add_dependency run gdk-pixbuf
Add_dependency run freetype
Add_dependency run fontconfig
-Add_dependency run libbonobo
-Add_dependency run ORBit2
-Add_dependency run GConf
-Add_dependency run libX11
-Add_dependency run libXau
-Add_dependency run libwnck
-Add_dependency run evolution-data-server
-Add_dependency run libical
-Add_dependency run libxml2
-Add_dependency run libsoup
-Add_dependency run librsvg
-Add_dependency run dbus-glib
-Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run polkit
-Add_dependency run dbus-libs
-Add_dependency run libgweather
Add_dependency run libSM
Add_dependency run libICE
-Add_dependency run gnome-menus
-Add_dependency run libcanberra
+Add_dependency run libX11
+Add_dependency run libXau
Add_dependency run libXrandr
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run nspr
-Add_dependency run nss
-Add_dependency run sqlite
-Add_dependency run NetworkManager
+Add_dependency run librsvg
+Add_dependency run gtk+3
+Add_dependency run dconf
+Add_dependency run libical
+Add_dependency run GConf
+Add_dependency run libgweather
+Add_dependency run libwnck
+Add_dependency run evolution-data-server
+Add_dependency run gnome-menus
+Add_dependency run gnome-desktop
+Add_dependency run telepathy-glib
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build nspr-devel
-Add_dependency build nss-devel
-Add_dependency build sqlite-devel
-Add_dependency build gtk+-devel ">=2.22.0_1"
-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 libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build GConf-devel ">=2.32.0_1"
-Add_dependency build libX11-devel
-Add_dependency build libXau-devel
-Add_dependency build libwnck-devel
-Add_dependency build evolution-data-server-devel
-Add_dependency build libical-devel
-Add_dependency build libxml2-devel
-Add_dependency build libsoup-devel
-Add_dependency build librsvg-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build polkit-devel
-Add_dependency build dbus-devel
-Add_dependency build libgweather-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
+Add_dependency build gnome-desktop-devel
+Add_dependency build GConf-devel
+Add_dependency build dconf-devel
Add_dependency build gnome-menus-devel
-Add_dependency build libcanberra-devel
+Add_dependency build gtk+3-devel
+Add_dependency build atk-devel
+Add_dependency build glib-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build pango-devel
+Add_dependency build dbus-glib-devel
Add_dependency build libXrandr-devel
-Add_dependency build NetworkManager-devel
-Add_dependency build which
-Add_dependency build diffutils
+Add_dependency build libX11-devel
+Add_dependency build evolution-data-server-devel
+Add_dependency build libical-devel
+Add_dependency build librsvg-devel
+Add_dependency build dbus-devel
+Add_dependency build libgweather-devel
+Add_dependency build libwnck-devel
+Add_dependency build libpng-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libXau-devel
+Add_dependency build telepathy-glib-devel
Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
+
+post_install()
+{
+ local f
+
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ for f in ${gconf_schemas}; do
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \
+ --domain ${pkgname}-3.0 ${wrksrc}/${f}
+ done
+}
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 5e36aeb2689..486928b9b9a 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -1,14 +1,12 @@
# Template file for 'gnome-power-manager'
pkgname=gnome-power-manager
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --enable-applets -with-dbus-services=/usr/share/dbus-1/services"
+configure_args="--disable-scrollkeeper --localstatedir=/var --disable-schemas-compile"
short_desc="GNOME power management tool"
maintainer="Juan RP "
-checksum=17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
+checksum=20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1
long_desc="
GNOME Power Manager is a session daemon for the GNOME desktop that takes care
of system or desktop events related to power, and triggers actions
@@ -20,78 +18,38 @@ long_desc="
trigger suspend-to-RAM, hibernate or shutdown events, all integrated to other
components of the GNOME desktop."
-gconf_schemas="$pkgname.schemas"
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libwnck
-Add_dependency run libgnome-keyring
-Add_dependency run gnome-panel
-Add_dependency run GConf
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-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 libbonobo
-Add_dependency run ORBit2
-Add_dependency run libXrandr
-Add_dependency run libXrender
+Add_dependency run gtk+3
Add_dependency run libX11
Add_dependency run libXext
+Add_dependency run libXrandr
Add_dependency run libcanberra
Add_dependency run libnotify
Add_dependency run upower
-Add_dependency run libunique
+Add_dependency run GConf
+Add_dependency run libgnome-keyring
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build libwnck-devel
-Add_dependency build libgnome-keyring-devel
-Add_dependency build gnome-panel-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-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 libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build libXrandr-devel
-Add_dependency build libXrender-devel
+Add_dependency build gtk+3-devel
Add_dependency build libX11-devel
Add_dependency build libXext-devel
+Add_dependency build libXrandr-devel
Add_dependency build libcanberra-devel
Add_dependency build libnotify-devel
Add_dependency build upower-devel
-Add_dependency build libunique-devel
+Add_dependency build GConf-devel
+Add_dependency build libgnome-keyring-devel
+Add_dependency full polkit-gnome
Add_dependency full hicolor-icon-theme
-
-post_install()
-{
- install -d ${DESTDIR}/usr/share/gconf/schemas
- mv ${DESTDIR}/etc/gconf/schemas/* ${DESTDIR}/usr/share/gconf/schemas
- rm -rf ${DESTDIR}/etc/gconf
-}
diff --git a/srcpkgs/gnome-python/template b/srcpkgs/gnome-python/template
deleted file mode 100644
index 692c8bb4e2e..00000000000
--- a/srcpkgs/gnome-python/template
+++ /dev/null
@@ -1,53 +0,0 @@
-# Template file for 'gnome-python'
-pkgname=gnome-python
-version=2.28.1
-distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-allbindings --enable-gconf --enable-gnome
---enable-gnomecanvas --enable-bonobo --enable-bonoboui"
-short_desc="Python bindings for the GNOME toolkit"
-maintainer="Juan RP "
-checksum=759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
-long_desc="
- This package provides the python language bindings for varios GNOME
- libraries for use in applications."
-
-Add_dependency run glibc
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libbonobo
-Add_dependency run glib
-Add_dependency run ORBit2
-Add_dependency run python
-Add_dependency run GConf
-Add_dependency run libgnomecanvas
-Add_dependency run libart
-Add_dependency run gtk+
-Add_dependency run atk
-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 pygtk
-
-Add_dependency build pkg-config
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libbonobo-devel
-Add_dependency build glib-devel
-Add_dependency build ORBit2-devel
-Add_dependency build python-devel
-Add_dependency build GConf-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libart-devel
-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 libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build pygtk-devel
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 579b7ca4af6..34a967b20f6 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,16 +1,12 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
-version=2.30.2
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --enable-locking --enable-pam --with-xf86gamma-ext
---enable-authentication-scheme=pam --with-mit-ext --with-libgl"
+configure_args="--localstatedir=/var"
short_desc="GNOME screen saver and locker"
maintainer="Juan RP "
-checksum=dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
+checksum=e00e801d94c1d9f1e62049f77b91d822047eb1dcbd2e01cc38b5dd1b0f67c948
long_desc="
${pkgname} is a screen saver and locker that aims to have simple, sane and
secure defaults, and be well integrated with the GNOME desktop.
@@ -22,53 +18,47 @@ long_desc="
* user switching"
# XXX: add xscreensaver hacks support.
-gconf_schemas="$pkgname.schemas"
-
conf_files="/etc/pam.d/${pkgname}"
Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run gtk+
Add_dependency run glib
-Add_dependency run MesaLib
-Add_dependency run gdk-pixbuf
-Add_dependency run cairo
-Add_dependency run pango
-Add_dependency run pam
-Add_dependency run libgnomekbd
-Add_dependency run GConf
-Add_dependency run libxklavier
-Add_dependency run libnotify
-Add_dependency run dbus-glib
Add_dependency run dbus-libs
-Add_dependency run gnome-desktop
-Add_dependency run gnome-menus
+Add_dependency run dbus-glib
+Add_dependency run libX11
Add_dependency run libXext
Add_dependency run libXxf86vm
Add_dependency run libXxf86misc
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run gtk+3
+Add_dependency run pam
+Add_dependency run libxklavier
+Add_dependency run libgnomekbd
+Add_dependency run MesaLib
+Add_dependency run gnome-menus
+Add_dependency run gnome-desktop
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build libX11-devel
-Add_dependency build gtk+-devel
Add_dependency build glib-devel
-Add_dependency build MesaLib-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
-Add_dependency build pango-devel
-Add_dependency build pam-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build GConf-devel
-Add_dependency build libxklavier-devel
-Add_dependency build libnotify-devel
-Add_dependency build dbus-glib-devel
Add_dependency build dbus-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build gnome-menus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libX11-devel
Add_dependency build libXext-devel
Add_dependency build libXxf86vm-devel
Add_dependency build libXxf86misc-devel
+Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build gtk+3-devel
+Add_dependency build pam-devel
+Add_dependency build libxklavier-devel
+Add_dependency build libgnomekbd-devel
+Add_dependency build MesaLib-devel
+Add_dependency build gnome-menus-devel
+Add_dependency build gnome-desktop-devel
Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 7d23b57a806..d065744cbf9 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-ipv6 --disable-schemas-install
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
+--localstatedir=/var --disable-schemas-compile"
short_desc="GNOME session management utilities"
maintainer="Juan RP "
-checksum=22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
+checksum=687f2f1daeae3614c36724c7d0f8a5a2eed61e941b11bc3b0f1b156293e51024
long_desc="
gnome-session provides the following components:
@@ -18,54 +18,49 @@ long_desc="
* The GNOME session manager proxy, which handles basic session
management for applications that do not support XSM."
-keep_empty_dirs=yes
-gconf_schemas="gnome-session.schemas"
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
-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 gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run gtk+
-Add_dependency run startup-notification
-Add_dependency run dbus-glib
Add_dependency run dbus-libs
+Add_dependency run dbus-glib
Add_dependency run libSM
Add_dependency run libICE
-Add_dependency run upower
-Add_dependency run libXrender
+Add_dependency run libXau
Add_dependency run libX11
+Add_dependency run libXrender
Add_dependency run libXtst
Add_dependency run libXext
-Add_dependency run libXau
+Add_dependency run libXcomposite
+Add_dependency run librsvg
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run gtk+3
+Add_dependency run MesaLib
+Add_dependency run upower
Add_dependency run GConf
+
Add_dependency build pkg-config
Add_dependency build intltool
-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 gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
-Add_dependency build startup-notification-devel
-Add_dependency build dbus-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 upower-devel
-Add_dependency build libXrender-devel
-Add_dependency build libX11-devel
-Add_dependency build libXtst-devel
-Add_dependency build libXext-devel
Add_dependency build libXau-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXrender-devel
+Add_dependency build libXtst-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build librsvg-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build gtk+3-devel
+Add_dependency build MesaLib-devel
+Add_dependency build upower-devel
Add_dependency build GConf-devel
+
Add_dependency full hicolor-icon-theme
-Add_dependency full polkit-gnome
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-settings-daemon/depends b/srcpkgs/gnome-settings-daemon/depends
index 071d27b792a..ab0d9627ad7 100644
--- a/srcpkgs/gnome-settings-daemon/depends
+++ b/srcpkgs/gnome-settings-daemon/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=3.0.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
index fab5b4c96a7..3e8c03fb060 100644
--- a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
+++ b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template
@@ -1,47 +1,45 @@
# Template file for 'gnome-settings-daemon-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."
-Add_dependency run automake
Add_dependency run pkg-config
Add_dependency run intltool
-Add_dependency run libxml2-devel
-Add_dependency run GConf-devel
-Add_dependency run gnome-desktop-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run libpng-devel
-Add_dependency run nspr-devel
-Add_dependency run polkit-devel
-Add_dependency run gtk+-devel
-Add_dependency run startup-notification-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 glib-devel
-Add_dependency run dbus-glib-devel
Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libpng-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
-Add_dependency run libXext-devel
Add_dependency run libX11-devel
-Add_dependency run gstreamer-devel
-Add_dependency run gst-plugins-base-devel
-Add_dependency run libXxf86misc-devel
-Add_dependency run libnotify-devel
-Add_dependency run libgnomekbd-devel
-Add_dependency run libxklavier-devel
+Add_dependency run libXext-devel
Add_dependency run libXi-devel
+Add_dependency run libXxf86misc-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run cairo-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gtk+3-devel
+Add_dependency run libxml2-devel
+Add_dependency run libxklavier-devel
+Add_dependency run libnotify-devel
+Add_dependency run polkit-devel
+Add_dependency run libcanberra-devel
+Add_dependency run pulseaudio-devel
+Add_dependency run nspr-devel
+Add_dependency run nss-devel
+Add_dependency run startup-notification-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-desktop-devel
+Add_dependency run libgnomekbd-devel
do_install()
{
- mkdir -p ${DESTDIR}/usr/lib/gnome-settings-daemon-2.0
+ mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/gnome-settings-daemon-2.0/*.a \
- ${DESTDIR}/usr/lib/gnome-settings-daemon-2.0
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index cad7afdb29a..24153ce6aeb 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,93 +1,83 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=2.32.1
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0.1
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+configure_args="--localstatedir=/var --disable-static --disable-cups
+--disable-schemas-compile --enable-pulse"
short_desc="GNOME settings daemon"
maintainer="Juan RP "
-checksum=0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
+checksum=4872b8ac4f85ee036539c433046de32017a4e3ac2bc2a49f62dc3bf152399cb3
long_desc="
This package provides a daemon to handle settings on the GNOME desktop."
-gconf_schemas="
-desktop_gnome_peripherals_smartcard.schemas
-apps_gnome_settings_daemon_housekeeping.schemas
-apps_gnome_settings_daemon_keybindings.schemas
-apps_gnome_settings_daemon_xrandr.schemas
-desktop_gnome_peripherals_touchpad.schemas
-desktop_gnome_font_rendering.schemas
-gnome-settings-daemon.schemas
-desktop_gnome_keybindings.schemas"
-
+# XXX add missing cups support.
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run polkit
Add_dependency run glib
-Add_dependency run dbus-glib
-Add_dependency run gtk+
-Add_dependency run cairo
-Add_dependency run libX11
-Add_dependency run GConf
Add_dependency run dbus-libs
-Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run gdk-pixbuf
+Add_dependency run dbus-glib
Add_dependency run libpng
-Add_dependency run freetype
-Add_dependency run fontconfig
Add_dependency run libSM
Add_dependency run libICE
+Add_dependency run libX11
Add_dependency run libXext
Add_dependency run libXi
-Add_dependency run libpulseaudio
-Add_dependency run libcanberra
Add_dependency run libXxf86misc
-Add_dependency run libnotify
-Add_dependency run nss
-Add_dependency run nspr
-Add_dependency run libgnomekbd
-Add_dependency run libxklavier
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run cairo
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+3
Add_dependency run libxml2
+Add_dependency run libxklavier
+Add_dependency run libnotify
+Add_dependency run polkit
+Add_dependency run libcanberra
+Add_dependency run libpulseaudio
+Add_dependency run nspr
+Add_dependency run nss
+Add_dependency run startup-notification
+Add_dependency run GConf
+Add_dependency run gnome-desktop
+Add_dependency run libgnomekbd
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build polkit-devel
Add_dependency build glib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gtk+-devel
-Add_dependency build cairo-devel
-Add_dependency build libX11-devel
-Add_dependency build GConf-devel
Add_dependency build dbus-devel
-Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
+Add_dependency build dbus-glib-devel
Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
+Add_dependency build libX11-devel
Add_dependency build libXext-devel
Add_dependency build libXi-devel
-Add_dependency build pulseaudio-devel
-Add_dependency build libcanberra-devel
Add_dependency build libXxf86misc-devel
-Add_dependency build libnotify-devel
-Add_dependency build nss-devel
-Add_dependency build nspr-devel
-Add_dependency build libgnomekbd-devel
-Add_dependency build libxklavier-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build cairo-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+3-devel
Add_dependency build libxml2-devel
+Add_dependency build libxklavier-devel
+Add_dependency build libnotify-devel
+Add_dependency build polkit-devel
+Add_dependency build libcanberra-devel
+Add_dependency build pulseaudio-devel
+Add_dependency build nspr-devel
+Add_dependency build nss-devel
+Add_dependency build startup-notification-devel
+Add_dependency build GConf-devel
+Add_dependency build gnome-desktop-devel
+Add_dependency build libgnomekbd-devel
Add_dependency full pulseaudio
Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
new file mode 100644
index 00000000000..e4644634c04
--- /dev/null
+++ b/srcpkgs/gnome-shell/template
@@ -0,0 +1,137 @@
+# Template file for 'gnome-shell'
+pkgname=gnome-shell
+version=3.0.0.2
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-schemas-install --disable-schemas-compile
+--localstatedir=/var --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+short_desc="GNOME core user interface"
+maintainer="Juan RP "
+checksum=5563b6374e84795526928ab398316611f94385ce0b278ef71769ff12498e4532
+long_desc="
+ GNOME Shell provides core user interface functions for the GNOME 3 desktop,
+ like switching to windows and launching applications. GNOME Shell takes
+ advantage of the capabilities of modern graphics hardware and introduces
+ innovative user interface concepts to provide a visually attractive and
+ easy to use experience."
+
+triggers="gsettings-schemas"
+gconf_schemas="$pkgname.schemas"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency run glibc
+Add_dependency run gjs
+Add_dependency run xulrunner
+Add_dependency run gnome-menus
+Add_dependency run gstreamer
+Add_dependency run libgirepository
+Add_dependency run libffi
+Add_dependency run libcanberra
+Add_dependency run telepathy-glib
+Add_dependency run polkit
+Add_dependency run gnome-bluetooth
+Add_dependency run clutter
+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 libcroco
+Add_dependency run gnome-desktop
+Add_dependency run startup-notification
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run libpulseaudio
+Add_dependency run evolution-data-server
+Add_dependency run libical
+Add_dependency run gtk+3
+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 nspr
+Add_dependency run nss
+Add_dependency run sqlite
+Add_dependency run libxml2
+Add_dependency run GConf
+Add_dependency run libsoup
+Add_dependency run glib
+Add_dependency run telepathy-logger
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build gjs-devel
+Add_dependency build xulrunner-devel
+Add_dependency build gnome-menus-devel
+Add_dependency build gstreamer-devel
+Add_dependency build libgirepository-devel
+Add_dependency build libffi-devel
+Add_dependency build libcanberra-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build polkit-devel
+Add_dependency build gnome-bluetooth-devel
+Add_dependency build clutter-devel
+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 libcroco-devel
+Add_dependency build gnome-desktop-devel
+Add_dependency build startup-notification-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build pulseaudio-devel
+Add_dependency build evolution-data-server-devel
+Add_dependency build libical-devel
+Add_dependency build gtk+3-devel
+Add_dependency build atk-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 nspr-devel
+Add_dependency build nss-devel
+Add_dependency build sqlite-devel
+Add_dependency build libxml2-devel
+Add_dependency build GConf-devel
+Add_dependency build libsoup-devel
+Add_dependency build glib-devel
+Add_dependency build telepathy-logger-devel
+
+Add_dependency full mesa-demos
+Add_dependency full mutter
+Add_dependency full pygobject
+Add_dependency full dbus-python
+Add_dependency full gir-freedesktop
+Add_dependency full desktop-file-utils
+
+pre_configure()
+{
+ # XXX Don't forget to change this if xulrunner version is bumped!
+ ldlibpaths="/usr/lib/xulrunner-1.9.2:/usr/lib/gnome-bluetooth"
+ export LDFLAGS="-Wl,-R/usr/lib/xulrunner-1.9.2 -Wl,-R/usr/lib/gnome-bluetooth"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldlibpaths"
+}
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
+
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 30139478def..8c79c110b87 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,68 +1,48 @@
# Template file for 'gnome-system-monitor'
pkgname=gnome-system-monitor
-version=2.28.2
-distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
+configure_args="--disable-schemas-compile --disable-scrollkeeper
--localstatedir=/var"
short_desc="Process viewer and system resource monitor for GNOME"
maintainer="Juan RP "
-checksum=b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
+checksum=8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24
long_desc="
This package allows you to graphically view and manipulate the running
processes on your system. It also provides an overview of available
resources such as CPU and memory."
-gconf_schemas="$pkgname.schemas"
+triggers="gsettings-schemas"
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
-Add_dependency run GConf
Add_dependency run libgtop
Add_dependency run libwnck
Add_dependency run gtkmm
-Add_dependency run pangomm
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run cairomm
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run freetype
-Add_dependency run fontconfig
+Add_dependency run gtk+3
Add_dependency run libxml2
Add_dependency run librsvg
+Add_dependency run gdk-pixbuf
Add_dependency run cairo
Add_dependency run glibmm
Add_dependency run glib
Add_dependency run libsigc++
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build GConf-devel
Add_dependency build libgtop-devel
Add_dependency build libwnck-devel
Add_dependency build gtkmm-devel
-Add_dependency build pangomm-devel
-Add_dependency build gtk+-devel
-Add_dependency build cairomm-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
+Add_dependency build gtk+3-devel
Add_dependency build libxml2-devel
Add_dependency build librsvg-devel
+Add_dependency build gdk-pixbuf-devel
Add_dependency build cairo-devel
Add_dependency build glibmm-devel
Add_dependency build glib-devel
Add_dependency build libsigc++-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-# libgksu is dlopen'ed.
-Add_dependency full gksu
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 21093298db8..214047d3dd8 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
+--localstatedir=/var --with-gtk=3.0"
short_desc="The GNOME terminal emulator application"
maintainer="Juan RP "
-checksum=7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
+checksum=16a3420176bbe5d58ad432306bfc40edb1423d43e311dd1d0de6da16559943f8
long_desc="
GNOME Terminal is a terminal emulation application that you can use to
perform the following actions:
@@ -36,8 +36,8 @@ Add_dependency run libICE
Add_dependency run libX11
Add_dependency run libpng
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run vte
+Add_dependency run gtk+3
+Add_dependency run vte3
Add_dependency run GConf
Add_dependency build pkg-config
@@ -54,6 +54,15 @@ Add_dependency build dbus-glib-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
Add_dependency build libX11-devel
-Add_dependency build gtk+-devel
-Add_dependency build vte-devel ">=0.26"
+Add_dependency build gtk+3-devel
+Add_dependency build vte3-devel
Add_dependency build GConf-devel
+
+Add_dependency full desktop-file-utils
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template
new file mode 100644
index 00000000000..70c60ddfe27
--- /dev/null
+++ b/srcpkgs/gnome-themes-standard/template
@@ -0,0 +1,41 @@
+# Template build file for 'gnome-themes-standard'.
+pkgname=gnome-themes-standard
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Standard gnome themes"
+maintainer="Juan RP "
+checksum=ea6215d814da2301e4a287e454693ee62616c0e42b57b0576c2489786e3487f3
+long_desc="
+ This package contains a set of standard gnome themes."
+
+gtk_iconcache_dirs="
+/usr/share/icons/LowContrast
+/usr/share/icons/HighContrast
+/usr/share/icons/HighContrastInverse"
+
+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 glibc
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+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 glibc-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+
+Add_dependency full gtk-engines
diff --git a/srcpkgs/gnome-themes/template b/srcpkgs/gnome-themes/template
index e606557d332..904d188a244 100644
--- a/srcpkgs/gnome-themes/template
+++ b/srcpkgs/gnome-themes/template
@@ -1,18 +1,34 @@
# Template file for 'gnome-themes'
pkgname=gnome-themes
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Default themes for GNOME"
maintainer="Juan RP "
-checksum=8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a
+checksum=b277b605185651571b7225a92e10755cb8ceb0d4e3eef0e85135312f0981f1c9
long_desc="
This package contains the default themes for the GNOME desktop."
+gtk_iconcache_dirs="
+/usr/share/icons/Crux
+/usr/share/icons/HighContrast
+/usr/share/icons/HighContrastInverse
+/usr/share/icons/HighContrastLargePrint
+/usr/share/icons/HighContrastLargePrintInverse
+/usr/share/icons/HighContrast-SVG
+/usr/share/icons/LargePrint
+/usr/share/icons/Mist"
+
noarch=yes
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build icon-naming-utils
Add_dependency full gtk-engines
Add_dependency full librsvg
+
+post_install()
+{
+ # {High,Low}Contrast themes are already in gnome-themes-standard.
+ rm -f ${DESTDIR}/usr/share/themes/{High,Low}Contrast*/index.theme
+}
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 5e6f4d995f1..2f4c0506960 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.92
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-scrollkeeper --localstatedir=/var"
short_desc="User documentation for GNOME"
maintainer="Juan RP "
-checksum=d42c4435590e5b79c8fcf1d917aee485096c02cdc84338bc31f769219ccc87f7
+checksum=cdb4e56ab346ced076b2ebc5a56c1334f6c1cebbff452a63be201b76a33091cc
long_desc="
This package provides several GNOME 2 documentation: the GNOME Access Guide,
the Introduction to GNOME document, the System Administration Guide and the
diff --git a/srcpkgs/gnome-utils/depends b/srcpkgs/gnome-utils/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/gnome-utils/depends
+++ b/srcpkgs/gnome-utils/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gnome-utils/gnome-utils-devel.template b/srcpkgs/gnome-utils/gnome-utils-devel.template
index d83292809b5..f9edd916884 100644
--- a/srcpkgs/gnome-utils/gnome-utils-devel.template
+++ b/srcpkgs/gnome-utils/gnome-utils-devel.template
@@ -14,7 +14,6 @@ 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/gtk-doc ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/gnome-utils/template b/srcpkgs/gnome-utils/template
index 10fd103ca48..0fe14c62e66 100644
--- a/srcpkgs/gnome-utils/template
+++ b/srcpkgs/gnome-utils/template
@@ -1,93 +1,68 @@
# Template file for 'gnome-utils'
pkgname=gnome-utils
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
--localstatedir=/var"
short_desc="GNOME common utilities"
maintainer="Juan RP "
-checksum=033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
+checksum=1cc095f69f4e224509727f648797fdee2190405a0f9005a65e4a0c53ae6547a6
long_desc="
This packages contains common utilities for the GNOME desktop."
-gconf_schemas="
-gnome-screenshot.schemas
-gnome-search-tool.schemas
-gnome-system-log.schemas
-baobab.schemas
-gnome-dictionary.schemas"
-
+triggers="gsettings-schemas"
+gconf_schemas="gnome-search-tool.schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run atk
+Add_dependency run gtk+3
Add_dependency run glib
Add_dependency run pango
+Add_dependency run gdk-pixbuf
Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run gnome-panel
-Add_dependency run GConf
-Add_dependency run libbonoboui
-Add_dependency run libgnomecanvas
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libart
-Add_dependency run libbonobo
-Add_dependency run ORBit2
-Add_dependency run zlib
-Add_dependency run libSM
-Add_dependency run libICE
Add_dependency run libgtop
+Add_dependency run freetype
Add_dependency run libXext
Add_dependency run libX11
Add_dependency run libcanberra
+Add_dependency run GConf
+Add_dependency run atk
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run zlib
+Add_dependency run libpng
+Add_dependency run fontconfig
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
+Add_dependency build gtk+3-devel
Add_dependency build glib-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 fontconfig-devel
-Add_dependency build gnome-panel-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonoboui-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libart-devel
-Add_dependency build libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build zlib-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
Add_dependency build libgtop-devel
+Add_dependency build freetype-devel
Add_dependency build libXext-devel
Add_dependency build libX11-devel
Add_dependency build libcanberra-devel
+Add_dependency build GConf-devel
+Add_dependency build atk-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build zlib-devel
+Add_dependency build libpng-devel
+Add_dependency build fontconfig-devel
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
-pre_configure()
-{
- # Use cmp(1) from diffutils.
- export PATH="/usr/bin:$PATH"
-}
-
post_install()
{
- # Remove it also from Xfce menu that ships its own thingy
- sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" \
- ${DESTDIR}/usr/share/applications/gnome-dictionary.desktop
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname}-2.0 ${wrksrc}/*.schemas
}
diff --git a/srcpkgs/gnome-vfs-devel b/srcpkgs/gnome-vfs-devel
deleted file mode 120000
index d8b1f884a37..00000000000
--- a/srcpkgs/gnome-vfs-devel
+++ /dev/null
@@ -1 +0,0 @@
-gnome-vfs
\ No newline at end of file
diff --git a/srcpkgs/gnome-vfs/gnome-vfs-devel.template b/srcpkgs/gnome-vfs/gnome-vfs-devel.template
deleted file mode 100644
index 144af3386fc..00000000000
--- a/srcpkgs/gnome-vfs/gnome-vfs-devel.template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'gnome-vfs-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 dbus-devel
-Add_dependency run glib-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
-Add_dependency run libxml2-devel
-Add_dependency run mit-krb5-devel
-Add_dependency run e2fsprogs-devel
-Add_dependency run acl-devel
-Add_dependency run attr-devel
-Add_dependency run gamin-devel
-Add_dependency run openssl-devel
-Add_dependency run GConf-devel
-Add_dependency run gnome-vfs
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib/gnome-vfs-2.0/modules \
- ${DESTDIR}/usr/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/lib/gnome-vfs-2.0/modules/*.a \
- ${DESTDIR}/usr/lib/gnome-vfs-2.0/modules
- mv ${SRCPKGDESTDIR}/usr/lib/gnome-vfs-2.0/include \
- ${DESTDIR}/usr/lib/gnome-vfs-2.0
- mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/gnome-vfs/template b/srcpkgs/gnome-vfs/template
deleted file mode 100644
index 0242f27a53f..00000000000
--- a/srcpkgs/gnome-vfs/template
+++ /dev/null
@@ -1,65 +0,0 @@
-# Template file for 'gnome-vfs'
-pkgname=gnome-vfs
-version=2.24.4
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--localstatedir=/var --disable-schemas-install
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---disable-samba --enable-openssl --disable-gnutls --disable-howl
---disable-avahi --disable-hal --enable-ipv6 --enable-fam"
-short_desc="GNOME Virtual File System"
-maintainer="Juan RP "
-checksum=62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-long_desc="
- GNOME VFS is the GNOME virtual file system. It is the foundation of the
- Nautilus file manager. It provides a modular architecture and ships with
- several modules that implement support for local files, http, ftp and others.
- It provides an URI-based API, a backend supporting asynchronous file
- operations, a MIME type manipulation library and other features."
-
-conf_files="
-/etc/gnome-vfs-2.0/modules/default-modules.conf
-/etc/gnome-vfs-2.0/modules/ssl-modules.conf"
-
-gconf_schemas="
-desktop_default_applications.schemas
-desktop_gnome_url_handlers.schemas
-system_dns_sd.schemas
-system_http_proxy.schemas
-system_smb.schemas"
-
-subpackages="$pkgname-devel"
-
-# XXX: Investigate smb, avahi, hal modules. gnome-vfs is deprecated.
-Add_dependency run glibc
-Add_dependency run dbus-libs
-Add_dependency run glib
-Add_dependency run dbus-glib
-Add_dependency run zlib
-Add_dependency run bzip2
-Add_dependency run libxml2
-Add_dependency run mit-krb5-libs
-Add_dependency run e2fsprogs-libs
-Add_dependency run acl
-Add_dependency run attr
-Add_dependency run libssl
-Add_dependency run gamin
-Add_dependency run GConf
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build zlib-devel
-Add_dependency build bzip2-devel
-Add_dependency build libxml2-devel
-Add_dependency build mit-krb5-devel
-Add_dependency build e2fsprogs-devel
-Add_dependency build acl-devel
-Add_dependency build attr-devel
-Add_dependency build gamin-devel
-Add_dependency build openssl-devel
-Add_dependency build GConf-devel
-Add_dependency build gnome-mime-data
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index f8e795785bc..84b65e3772c 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,6 @@
# Template file for 'gnome'
pkgname=gnome
-version=2.32.1
-revision=5
+version=3.0.0
build_style=meta-template
short_desc="GNOME meta-package"
maintainer="Juan RP "
@@ -10,31 +9,30 @@ long_desc="
desktop system."
noarch=yes
-Add_dependency full gnome-applets
Add_dependency full gnome-backgrounds
+#Add_dependency full gnome-themes
+Add_dependency full gnome-themes-standard
Add_dependency full gnome-control-center
Add_dependency full gnome-desktop
Add_dependency full gnome-icon-theme
Add_dependency full gnome-icon-theme-extras
-Add_dependency full gnome-media
-Add_dependency full gnome-mime-data
+Add_dependency full gnome-icon-theme-symbolic
Add_dependency full gnome-panel
Add_dependency full gnome-session
Add_dependency full gnome-settings-daemon
-Add_dependency full gnome-themes
Add_dependency full gnome-user-docs
Add_dependency full gnome-screensaver
+Add_dependency full gnome-shell
Add_dependency full metacity
Add_dependency full nautilus
Add_dependency full notification-daemon
Add_dependency full yelp
Add_dependency full epiphany
-Add_dependency full at-spi
+Add_dependency full at-spi2-atk
Add_dependency full gnome-terminal
Add_dependency full gnome-power-manager
Add_dependency full gnome-utils
-Add_dependency full gnome-netstatus
Add_dependency full gnome-system-monitor
Add_dependency full gnome-bluetooth
Add_dependency full eog
@@ -44,6 +42,11 @@ Add_dependency full file-roller
Add_dependency full seahorse
Add_dependency full totem
Add_dependency full brasero
+Add_dependency full empathy
+Add_dependency full vino
+Add_dependency full gcalctool
+Add_dependency full network-manager-applet
+Add_dependency full cantarell-fonts
Add_dependency full xdg-user-dirs
Add_dependency full xdg-utils
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 14805eb465e..91e8c46a9e5 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,11 +1,11 @@
# Template file for 'gobject-introspection'
pkgname=gobject-introspection
-version=0.10.3
+version=0.10.6
distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Introspection system for GObject-based libraries"
maintainer="Juan RP "
-checksum=1d5fb9b094b170ff13d22886f60b148522432a654ddc832371bf94b89ec3840b
+checksum=5a72ec875c5d6e9714912bdfed2761903f994e9c5dae841add755b449e014583
long_desc="
The goal of the project is to describe the APIs and collect them in
a uniform, machine readable format."
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
new file mode 100644
index 00000000000..36ed2958762
--- /dev/null
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -0,0 +1,25 @@
+# Template file for 'gsettings-desktop-schemas'
+pkgname=gsettings-desktop-schemas
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="Collection of GSettings schemas"
+maintainer="Juan RP "
+checksum=1b8d7f6141379f3ab58ca917baa3eb947e78d6425664b21dc199a35f99991af6
+long_desc="
+ ${pkgname} contains a collection of GSettings schemas for
+ settings shared by various components of a desktop."
+
+triggers="gsettings-schemas"
+noarch=yes
+
+Add_dependency run glib ">=0"
+Add_dependency build pkg-config
+Add_dependency build intltool
+
+post_install()
+{
+ install -d ${DESTDIR}/usr/lib
+ mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/gssdp/gir-gssdp.template b/srcpkgs/gssdp/gir-gssdp.template
deleted file mode 100644
index 29b36813729..00000000000
--- a/srcpkgs/gssdp/gir-gssdp.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gssdp'.
-#
-short_desc="Introspection data for GUPNP gssdp"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for GUPNP gssdp."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template
index 23d8f136999..c3594931c9c 100644
--- a/srcpkgs/gssdp/template
+++ b/srcpkgs/gssdp/template
@@ -1,6 +1,7 @@
# Template file for 'gssdp'
pkgname=gssdp
version=0.9.0
+revision=1
distfiles="http://gupnp.org/sites/all/files/sources/gssdp-$version.tar.gz"
build_style=gnu_configure
short_desc="GObject-based library for SSDP"
@@ -10,7 +11,7 @@ long_desc="
A GObject-based API for doing SSDP (Simple Service Discovery Protocol)
transparently."
-subpackages="gir-gssdp gssdp-devel"
+subpackages="gssdp-devel"
Add_dependency run glibc
Add_dependency run glib
diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template
index 7d1cd56fb2c..23497e1ab5d 100644
--- a/srcpkgs/gst-plugins-bad/template
+++ b/srcpkgs/gst-plugins-bad/template
@@ -1,6 +1,7 @@
# Template file for 'gst-plugins-bad'.
pkgname=gst-plugins-bad
version=0.10.21
+revision=1
distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-experimental"
@@ -51,13 +52,15 @@ Add_dependency run xvidcore
Add_dependency run libjasper
Add_dependency run libmodplug
Add_dependency run neon
+Add_dependency run libvpx
+Add_dependency run bzip2
+Add_dependency run libmms
Add_dependency run gstreamer
Add_dependency run gst-plugins-base
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build coreutils
-Add_dependency build diffutils
Add_dependency build gstreamer-devel
Add_dependency build glib-devel
Add_dependency build libxml2-devel
@@ -65,6 +68,8 @@ Add_dependency build gst-plugins-base-devel
Add_dependency build libX11-devel
Add_dependency build libdca-devel
Add_dependency build orc-devel
+Add_dependency build bzip2-devel
+Add_dependency build libmms-devel
Add_dependency build exempi-devel
Add_dependency build libexif-devel
Add_dependency build alsa-lib-devel
@@ -85,8 +90,4 @@ Add_dependency build xvidcore-devel
Add_dependency build jasper-devel
Add_dependency build libmodplug-devel
Add_dependency build neon-devel
-
-pre_configure()
-{
- export PATH="/bin:/usr/bin:$PATH"
-}
+Add_dependency build libvpx-devel
diff --git a/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template b/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template
deleted file mode 100644
index e37431cb7f7..00000000000
--- a/srcpkgs/gst-plugins-base/gir-gst-plugins-base.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gst-plugins-base'.
-#
-short_desc="GStreamer base plugins introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GStreamer base in
- plugins binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gst-plugins-base
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index f2dedeafadc..2ebb159b736 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -1,6 +1,7 @@
# Template file for 'gst-plugins-base'.
pkgname=gst-plugins-base
version=0.10.32
+revision=1
distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-experimental --disable-gnome_vfs"
@@ -17,7 +18,7 @@ long_desc="
This package contains a set of well-maintained base plug-ins."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run libgudev
Add_dependency run gstreamer
diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template
index 92484a4a6f7..40f5791ce69 100644
--- a/srcpkgs/gst-plugins-good/template
+++ b/srcpkgs/gst-plugins-good/template
@@ -1,6 +1,6 @@
# Template file for 'gst-plugins-good'.
pkgname=gst-plugins-good
-version=0.10.27
+version=0.10.28
distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--with-gudev --with-libv4l2 --enable-experimental
@@ -9,7 +9,7 @@ configure_args="--with-gudev --with-libv4l2 --enable-experimental
--with-gconf-schema-file-dir=/usr/share/gconf/schemas"
short_desc="Core GStreamer libraries and elements"
maintainer="pancake "
-checksum=a9d801c3d42b456a6ebc0b95f68c44f153f756ec0fbd4877197c469cc67771fa
+checksum=adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028
long_desc="
GStreamer is a streaming media framework, goodd on graphs of filters which
operate on media data. Applications using this library can do anything
@@ -86,7 +86,9 @@ Add_dependency build wavpack-devel
Add_dependency build coreutils
Add_dependency build diffutils
-pre_configure()
+post_install()
{
- export PATH="/bin:/usr/bin:$PATH"
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname}-0.10 ${wrksrc}/*.schemas
}
diff --git a/srcpkgs/gst-python/depends b/srcpkgs/gst-python/depends
new file mode 100644
index 00000000000..de28b45c3b0
--- /dev/null
+++ b/srcpkgs/gst-python/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.10.21"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template
new file mode 100644
index 00000000000..be6e5fb4a56
--- /dev/null
+++ b/srcpkgs/gst-python/template
@@ -0,0 +1,25 @@
+# Template file for 'gst-python'.
+pkgname=gst-python
+version=0.10.21
+distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Python bindings for GStreamer 0.10"
+maintainer="pancake "
+checksum=d5962132c84b88b54d0f63832b8dfcc383a7805827da5abc2d1d215ba86a6f92
+long_desc="
+ This package provides the Python language bindings for the GStreamer 0.10
+ multimedia framework."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run gstreamer
+Add_dependency run gst-plugins-base
+
+Add_dependency build pkg-config
+Add_dependency build glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build gstreamer-devel
+Add_dependency build gst-plugins-base-devel
+
+Add_dependency full python
diff --git a/srcpkgs/gstreamer/gir-gstreamer.template b/srcpkgs/gstreamer/gir-gstreamer.template
deleted file mode 100644
index 51c93a030a4..00000000000
--- a/srcpkgs/gstreamer/gir-gstreamer.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gstreamer'.
-#
-short_desc="GStreamer introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of GStreamer in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run gstreamer
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index 6dce128a4c8..08c23e094cb 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -1,6 +1,7 @@
# Template file for 'gstreamer'.
pkgname=gstreamer
version=0.10.32
+revision=1
distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-debug --disable-valgrind --enable-docbook
@@ -17,7 +18,7 @@ long_desc="
transparently. Developers can add new codecs and filters by writing a simple
plugin with a clean, generic interface."
-subpackages="gir-gstreamer $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run libxml2
Add_dependency run glib
@@ -30,8 +31,3 @@ Add_dependency build glib-devel
Add_dependency build gobject-introspection
Add_dependency build coreutils
Add_dependency build diffutils
-
-pre_configure()
-{
- export PATH="/bin:/usr/bin:$PATH"
-}
diff --git a/srcpkgs/gtk+/gir-gtk+.template b/srcpkgs/gtk+/gir-gtk+.template
deleted file mode 100644
index 9fcbe58eff8..00000000000
--- a/srcpkgs/gtk+/gir-gtk+.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gtk+'.
-#
-short_desc="Introspection data for GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GTK+ library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 86a10767ee7..e754b9b8aad 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-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 glibc
Add_dependency run glib
Add_dependency run pango
diff --git a/srcpkgs/gtk+/patches/old-icon-symlinks.patch b/srcpkgs/gtk+/patches/old-icon-symlinks.patch
deleted file mode 100644
index 528dac04b0c..00000000000
--- a/srcpkgs/gtk+/patches/old-icon-symlinks.patch
+++ /dev/null
@@ -1,268 +0,0 @@
---- gtk/Makefile.in.old 2010-10-15 04:57:50.810006145 +0800
-+++ gtk/Makefile.in 2010-10-15 05:13:49.083339478 +0800
-@@ -1598,7 +1598,172 @@
- stock-icons/24/folder-remote.png \
- stock-icons/24/user-home.png \
- stock-icons/24/user-desktop.png \
-- stock-icons/24/text-x-generic.png
-+ stock-icons/24/text-x-generic.png \
-+ stock-icons/16/gtk-quit.png \
-+ stock-icons/16/gtk-info.png \
-+ stock-icons/16/gtk-file.png \
-+ stock-icons/16/gtk-open.png \
-+ stock-icons/16/gtk-print-preview.png \
-+ stock-icons/16/gtk-print.png \
-+ stock-icons/16/gtk-properties.png \
-+ stock-icons/16/gtk-revert-to-saved-ltr.png \
-+ stock-icons/16/gtk-revert-to-saved-rtl.png \
-+ stock-icons/16/gtk-save-as.png \
-+ stock-icons/16/gtk-new.png \
-+ stock-icons/16/gtk-harddisk.png \
-+ stock-icons/16/gtk-clear.png \
-+ stock-icons/16/gtk-copy.png \
-+ stock-icons/16/gtk-cut.png \
-+ stock-icons/16/gtk-delete.png \
-+ stock-icons/16/gtk-find-and-replace.png \
-+ stock-icons/16/gtk-find.png \
-+ stock-icons/16/gtk-paste.png \
-+ stock-icons/16/gtk-redo-ltr.png \
-+ stock-icons/16/gtk-redo-rtl.png \
-+ stock-icons/16/gtk-select-all.png \
-+ stock-icons/16/gtk-undo-ltr.png \
-+ stock-icons/16/gtk-undo-rtl.png \
-+ stock-icons/16/gtk-directory.png \
-+ stock-icons/16/gtk-unindent-ltr.png \
-+ stock-icons/16/gtk-unindent-rtl.png \
-+ stock-icons/16/gtk-indent-ltr.png \
-+ stock-icons/16/gtk-indent-rtl.png \
-+ stock-icons/16/gtk-justify-center.png \
-+ stock-icons/16/gtk-justify-fill.png \
-+ stock-icons/16/gtk-justify-left.png \
-+ stock-icons/16/gtk-justify-right.png \
-+ stock-icons/16/gtk-bold.png \
-+ stock-icons/16/gtk-italic.png \
-+ stock-icons/16/gtk-strikethrough.png \
-+ stock-icons/16/gtk-underline.png \
-+ stock-icons/16/gtk-goto-bottom.png \
-+ stock-icons/16/gtk-go-down.png \
-+ stock-icons/16/gtk-goto-first-ltr.png \
-+ stock-icons/16/gtk-home.png \
-+ stock-icons/16/gtk-jump-to-ltr.png \
-+ stock-icons/16/gtk-jump-to-rtl.png \
-+ stock-icons/16/gtk-goto-last-ltr.png \
-+ stock-icons/16/gtk-go-forward-ltr.png \
-+ stock-icons/16/gtk-go-back-ltr.png \
-+ stock-icons/16/gtk-goto-top.png \
-+ stock-icons/16/gtk-go-up.png \
-+ stock-icons/16/gtk-about.png \
-+ stock-icons/16/gtk-help.png \
-+ stock-icons/16/gtk-missing-image.png \
-+ stock-icons/16/gtk-add.png \
-+ stock-icons/16/gtk-remove.png \
-+ stock-icons/16/gtk-floppy.png \
-+ stock-icons/16/gtk-cdrom.png \
-+ stock-icons/16/gtk-media-pause.png \
-+ stock-icons/16/gtk-media-play-ltr.png \
-+ stock-icons/16/gtk-media-play-rtl.png \
-+ stock-icons/16/gtk-media-stop.png \
-+ stock-icons/16/gtk-media-record.png \
-+ stock-icons/16/gtk-media-rewind-ltr.png \
-+ stock-icons/16/gtk-media-forward-ltr.png \
-+ stock-icons/16/gtk-media-previous-ltr.png \
-+ stock-icons/16/gtk-media-next-ltr.png \
-+ stock-icons/16/gtk-network.png \
-+ stock-icons/16/gtk-print-error.png \
-+ stock-icons/16/gtk-print-report.png \
-+ stock-icons/16/gtk-print-paused.png \
-+ stock-icons/16/gtk-print-warning.png \
-+ stock-icons/16/gtk-stop.png \
-+ stock-icons/16/gtk-execute.png \
-+ stock-icons/16/gtk-spell-check.png \
-+ stock-icons/16/gtk-fullscreen.png \
-+ stock-icons/16/gtk-refresh.png \
-+ stock-icons/16/gtk-leave-fullscreen.png \
-+ stock-icons/16/gtk-sort-ascending.png \
-+ stock-icons/16/gtk-sort-descending.png \
-+ stock-icons/16/gtk-close.png \
-+ stock-icons/16/gtk-zoom-fit.png \
-+ stock-icons/16/gtk-zoom-in.png \
-+ stock-icons/16/gtk-zoom-100.png \
-+ stock-icons/16/gtk-zoom-out.png \
-+ stock-icons/24/gtk-quit.png \
-+ stock-icons/24/gtk-info.png \
-+ stock-icons/24/gtk-file.png \
-+ stock-icons/24/gtk-open.png \
-+ stock-icons/24/gtk-print-preview.png \
-+ stock-icons/24/gtk-print.png \
-+ stock-icons/24/gtk-properties.png \
-+ stock-icons/24/gtk-revert-to-saved-ltr.png \
-+ stock-icons/24/gtk-revert-to-saved-rtl.png \
-+ stock-icons/24/gtk-save-as.png \
-+ stock-icons/24/gtk-new.png \
-+ stock-icons/24/gtk-harddisk.png \
-+ stock-icons/24/gtk-clear.png \
-+ stock-icons/24/gtk-copy.png \
-+ stock-icons/24/gtk-cut.png \
-+ stock-icons/24/gtk-delete.png \
-+ stock-icons/24/gtk-find-and-replace.png \
-+ stock-icons/24/gtk-find.png \
-+ stock-icons/24/gtk-paste.png \
-+ stock-icons/24/gtk-redo-ltr.png \
-+ stock-icons/24/gtk-redo-rtl.png \
-+ stock-icons/24/gtk-select-all.png \
-+ stock-icons/24/gtk-undo-ltr.png \
-+ stock-icons/24/gtk-undo-rtl.png \
-+ stock-icons/24/gtk-directory.png \
-+ stock-icons/24/gtk-unindent-ltr.png \
-+ stock-icons/24/gtk-unindent-rtl.png \
-+ stock-icons/24/gtk-indent-ltr.png \
-+ stock-icons/24/gtk-indent-rtl.png \
-+ stock-icons/24/gtk-justify-center.png \
-+ stock-icons/24/gtk-justify-fill.png \
-+ stock-icons/24/gtk-justify-left.png \
-+ stock-icons/24/gtk-justify-right.png \
-+ stock-icons/24/gtk-bold.png \
-+ stock-icons/24/gtk-italic.png \
-+ stock-icons/24/gtk-strikethrough.png \
-+ stock-icons/24/gtk-underline.png \
-+ stock-icons/24/gtk-goto-bottom.png \
-+ stock-icons/24/gtk-go-down.png \
-+ stock-icons/24/gtk-goto-first-ltr.png \
-+ stock-icons/24/gtk-home.png \
-+ stock-icons/24/gtk-jump-to-ltr.png \
-+ stock-icons/24/gtk-jump-to-rtl.png \
-+ stock-icons/24/gtk-goto-last-ltr.png \
-+ stock-icons/24/gtk-go-forward-ltr.png \
-+ stock-icons/24/gtk-go-back-ltr.png \
-+ stock-icons/24/gtk-goto-top.png \
-+ stock-icons/24/gtk-go-up.png \
-+ stock-icons/24/gtk-about.png \
-+ stock-icons/24/gtk-help.png \
-+ stock-icons/24/gtk-missing-image.png \
-+ stock-icons/24/gtk-add.png \
-+ stock-icons/24/gtk-remove.png \
-+ stock-icons/24/gtk-floppy.png \
-+ stock-icons/24/gtk-cdrom.png \
-+ stock-icons/24/gtk-media-pause.png \
-+ stock-icons/24/gtk-media-play-ltr.png \
-+ stock-icons/24/gtk-media-play-rtl.png \
-+ stock-icons/24/gtk-media-stop.png \
-+ stock-icons/24/gtk-media-record.png \
-+ stock-icons/24/gtk-media-rewind-ltr.png \
-+ stock-icons/24/gtk-media-forward-ltr.png \
-+ stock-icons/24/gtk-media-previous-ltr.png \
-+ stock-icons/24/gtk-media-next-ltr.png \
-+ stock-icons/24/gtk-network.png \
-+ stock-icons/24/gtk-print-error.png \
-+ stock-icons/24/gtk-print-report.png \
-+ stock-icons/24/gtk-print-paused.png \
-+ stock-icons/24/gtk-print-warning.png \
-+ stock-icons/24/gtk-stop.png \
-+ stock-icons/24/gtk-execute.png \
-+ stock-icons/24/gtk-spell-check.png \
-+ stock-icons/24/gtk-fullscreen.png \
-+ stock-icons/24/gtk-refresh.png \
-+ stock-icons/24/gtk-leave-fullscreen.png \
-+ stock-icons/24/gtk-sort-ascending.png \
-+ stock-icons/24/gtk-sort-descending.png \
-+ stock-icons/24/gtk-close.png \
-+ stock-icons/24/gtk-zoom-fit.png \
-+ stock-icons/24/gtk-zoom-in.png \
-+ stock-icons/24/gtk-zoom-100.png \
-+ stock-icons/24/gtk-zoom-out.png \
-+ stock-icons/48/gtk-dialog-error.png
-
- @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
-@@ -2869,7 +3034,91 @@
- && $(LN_S) folder.png user-desktop.png \
- && $(RM) text-x-generic.png \
- && $(LN_S) document-x-generic.png text-x-generic.png \
-+ && $(LN_S) application-exit.png gtk-quit.png \
-+ && $(LN_S) dialog-information.png gtk-info.png \
-+ && $(LN_S) document-new.png gtk-file.png \
-+ && $(LN_S) document-open.png gtk-open.png \
-+ && $(LN_S) document-print-preview.png gtk-print-preview.png \
-+ && $(LN_S) document-print.png gtk-print.png \
-+ && $(LN_S) document-properties.png gtk-properties.png \
-+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \
-+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \
-+ && $(LN_S) document-save-as.png gtk-save-as.png \
-+ && $(LN_S) document-x-generic.png gtk-new.png \
-+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \
-+ && $(LN_S) edit-clear.png gtk-clear.png \
-+ && $(LN_S) edit-copy.png gtk-copy.png \
-+ && $(LN_S) edit-cut.png gtk-cut.png \
-+ && $(LN_S) edit-delete.png gtk-delete.png \
-+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \
-+ && $(LN_S) edit-find.png gtk-find.png \
-+ && $(LN_S) edit-paste.png gtk-paste.png \
-+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \
-+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \
-+ && $(LN_S) edit-select-all.png gtk-select-all.png \
-+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \
-+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \
-+ && $(LN_S) folder.png gtk-directory.png \
-+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \
-+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \
-+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \
-+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \
-+ && $(LN_S) format-justify-center.png gtk-justify-center.png \
-+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \
-+ && $(LN_S) format-justify-left.png gtk-justify-left.png \
-+ && $(LN_S) format-justify-right.png gtk-justify-right.png \
-+ && $(LN_S) format-text-bold.png gtk-bold.png \
-+ && $(LN_S) format-text-italic.png gtk-italic.png \
-+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \
-+ && $(LN_S) format-text-underline.png gtk-underline.png \
-+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \
-+ && $(LN_S) go-down.png gtk-go-down.png \
-+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \
-+ && $(LN_S) go-home.png gtk-home.png \
-+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \
-+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \
-+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \
-+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \
-+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \
-+ && $(LN_S) go-top.png gtk-goto-top.png \
-+ && $(LN_S) go-up.png gtk-go-up.png \
-+ && $(LN_S) help-about.png gtk-about.png \
-+ && $(LN_S) help-contents.png gtk-help.png \
-+ && $(LN_S) image-missing.png gtk-missing-image.png \
-+ && $(LN_S) list-add.png gtk-add.png \
-+ && $(LN_S) list-remove.png gtk-remove.png \
-+ && $(LN_S) media-floppy.png gtk-floppy.png \
-+ && $(LN_S) media-optical.png gtk-cdrom.png \
-+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \
-+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \
-+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \
-+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \
-+ && $(LN_S) media-record.png gtk-media-record.png \
-+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \
-+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \
-+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \
-+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \
-+ && $(LN_S) network-idle.png gtk-network.png \
-+ && $(LN_S) printer-error.png gtk-print-error.png \
-+ && $(LN_S) printer-info.png gtk-print-report.png \
-+ && $(LN_S) printer-paused.png gtk-print-paused.png \
-+ && $(LN_S) printer-warning.png gtk-print-warning.png \
-+ && $(LN_S) process-stop.png gtk-stop.png \
-+ && $(LN_S) system-run.png gtk-execute.png \
-+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \
-+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \
-+ && $(LN_S) view-refresh.png gtk-refresh.png \
-+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \
-+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \
-+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \
-+ && $(LN_S) window-close.png gtk-close.png \
-+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \
-+ && $(LN_S) zoom-in.png gtk-zoom-in.png \
-+ && $(LN_S) zoom-original.png gtk-zoom-100.png \
-+ && $(LN_S) zoom-out.png gtk-zoom-out.png \
- ) done \
-+ && (cd stock-icons/48 \
-+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \
- && touch stamp-icons
-
- gtkbuiltincache.h: @REBUILD@ stamp-icons
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 2c231f48844..8def50b4618 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,12 +1,12 @@
# Template build file for 'gtk+'.
pkgname=gtk+
-version=2.24.1
+version=2.24.4
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-cups --with-xinput"
short_desc="The GTK+ toolkit (v2)"
maintainer="Juan RP "
-checksum=0e2f94dfeb82ffb73640e17a411b9d62851dc4b2e147d90a24f94c1bfc0491ed
+checksum=7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5
long_desc="
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -20,7 +20,7 @@ long_desc="
conf_files="/etc/gtk-2.0/im-multipress.conf"
triggers="gtk-immodules"
-subpackages="gir-gtk+ gtk+-devel"
+subpackages="gtk+-devel"
Add_dependency run glibc
Add_dependency run libXext
diff --git a/srcpkgs/gtk+3/gir-gtk+3.template b/srcpkgs/gtk+3/gir-gtk+3.template
deleted file mode 100644
index 9fcbe58eff8..00000000000
--- a/srcpkgs/gtk+3/gir-gtk+3.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-gtk+'.
-#
-short_desc="Introspection data for GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GTK+ library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 71a2035e112..88d739cdd10 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
# Template build file for 'gtk+3'.
pkgname=gtk+3
-version=3.0.1
+version=3.0.8
wrksrc="gtk+-${version}"
distfiles="${GNOME_SITE}/gtk+/3.0/gtk+-$version.tar.bz2"
build_style=gnu_configure
@@ -8,7 +8,7 @@ configure_args="--disable-cups --disable-schemas-compile
--enable-gtk2-dependency"
short_desc="The GTK+ toolkit (v3)"
maintainer="Juan RP "
-checksum=2bd0a197dc2a7e981790a720552bfd540a77b6edaa382dd7450366ee23e35121
+checksum=42b2b1a400372fe0b3ef890162d1610422f7e787af0765b59f1b3352a4839308
long_desc="
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -22,7 +22,7 @@ long_desc="
triggers="gtk3-immodules gsettings-schemas"
conf_files="/etc/gtk-3.0/im-multipress.conf"
-subpackages="gir-gtk+3 gtk+3-devel"
+subpackages="gtk+3-devel"
Add_dependency run glibc
Add_dependency run glib
diff --git a/srcpkgs/gtk-engines/template b/srcpkgs/gtk-engines/template
index 2a53f6eebcc..828e27ada81 100644
--- a/srcpkgs/gtk-engines/template
+++ b/srcpkgs/gtk-engines/template
@@ -1,12 +1,12 @@
# Template file for 'gtk-engines'
pkgname=gtk-engines
-version=2.20.2
-distfiles="${GNOME_SITE}/$pkgname/2.20/$pkgname-$version.tar.bz2"
+version=2.91.1
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-animation"
short_desc="GTK+ Theme engines"
maintainer="Juan RP "
-checksum=15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5
+checksum=e0ed144cdd298bc69b53face0e907369fb6a51f1eb333b5d04331f12758b454c
long_desc="
This package contains theme engines for the GTK+ toolkit."
@@ -19,7 +19,7 @@ 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 build pkg-config
Add_dependency build intltool
@@ -29,4 +29,4 @@ Add_dependency build pango-devel
Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
diff --git a/srcpkgs/gtkmm/depends b/srcpkgs/gtkmm/depends
index c85d5d8b3db..ca4ae8296c4 100644
--- a/srcpkgs/gtkmm/depends
+++ b/srcpkgs/gtkmm/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.20.1"
+abi_depends=">=2.99.5"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index e71e617ecab..0f1389e0c35 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,11 +1,11 @@
# Template build file for 'gtkmm'.
pkgname=gtkmm
-version=2.22.0
-distfiles="${GNOME_SITE}/gtkmm/2.22/$pkgname-$version.tar.bz2"
+version=2.99.8
+distfiles="${GNOME_SITE}/gtkmm/2.99/gtkmm-$version.tar.bz2"
build_style=gnu_configure
short_desc="C++ bindings for The GTK+ toolkit (v2)"
maintainer="Juan RP "
-checksum=8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
+checksum=0ee2283d5aa27c1ebf3fd8bae36d9345f9625590ac9f07212e1c97626440d144
long_desc="
gtkmm (previously known as Gtk--) is the official C++ interface for the
popular GUI library GTK+. Highlights include typesafe callbacks, widgets
@@ -14,10 +14,10 @@ long_desc="
an overview, with documentation and status. gtkmm is free software
distributed under the GNU Library General Public License (LGPL).
- Aside from the C++ interface to Gtk 2.x, this package also provides
+ Aside from the C++ interface to Gtk 3.x, this package also provides
bindings for the ATK library."
-subpackages="$pkgname-devel"
+subpackages="gtkmm-devel"
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
@@ -29,7 +29,7 @@ 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 libsigc++
Add_dependency run glibmm
Add_dependency run atkmm
@@ -43,7 +43,7 @@ Add_dependency build pango-devel
Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build libsigc++-devel
Add_dependency build glibmm-devel
Add_dependency build atkmm-devel
diff --git a/srcpkgs/gtksourceview/depends b/srcpkgs/gtksourceview/depends
index 2f428f61c18..ab0d9627ad7 100644
--- a/srcpkgs/gtksourceview/depends
+++ b/srcpkgs/gtksourceview/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.10.0"
+abi_depends=">=3.0.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gtksourceview/gtksourceview-devel.template b/srcpkgs/gtksourceview/gtksourceview-devel.template
index 6e6ee3e19a6..c0dbc63713c 100644
--- a/srcpkgs/gtksourceview/gtksourceview-devel.template
+++ b/srcpkgs/gtksourceview/gtksourceview-devel.template
@@ -1,6 +1,6 @@
# Template file for 'gtksourceview-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."
@@ -13,7 +13,7 @@ Add_dependency run pango-devel
Add_dependency run cairo-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
-Add_dependency run gtk+-devel
+Add_dependency run gtk3+-devel
Add_dependency run libxml2-devel
Add_dependency run gtksourceview
@@ -22,5 +22,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
}
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index 26aa61b436f..d2293cf0865 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -1,13 +1,12 @@
# Template file for 'gtksourceview'
pkgname=gtksourceview
-version=2.10.3
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.10/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Text widget that extends GTK+ GtkTextView widget"
maintainer="Juan RP "
-checksum=4657d680ef2648d1068cd2b5a8cc42254c1f1119aca4db8f679b78e363bd88f6
+checksum=5d871c62cd9fe4dcd0386f69bdb6c7f308a4d3122f27cbb1b7bcc9e03c9ac08d
long_desc="
GtkSourceView is a text widget that extends the standard gtk+ 2.x text
widget GtkTextView. It improves GtkTextView by implementing syntax
@@ -24,7 +23,7 @@ Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run gdk-pixbuf
Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run gtk+3
Add_dependency run libxml2
Add_dependency build pkg-config
@@ -35,5 +34,6 @@ Add_dependency build pango-devel
Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build libxml2-devel
+Add_dependency build gobject-introspection
diff --git a/srcpkgs/gucharmap-python b/srcpkgs/gucharmap-python
deleted file mode 120000
index cafd15efd5b..00000000000
--- a/srcpkgs/gucharmap-python
+++ /dev/null
@@ -1 +0,0 @@
-gucharmap
\ No newline at end of file
diff --git a/srcpkgs/gucharmap/depends b/srcpkgs/gucharmap/depends
index 071d27b792a..ab0d9627ad7 100644
--- a/srcpkgs/gucharmap/depends
+++ b/srcpkgs/gucharmap/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=3.0.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gucharmap/gucharmap-devel.template b/srcpkgs/gucharmap/gucharmap-devel.template
index 5d4b934a4c6..51b5464b06f 100644
--- a/srcpkgs/gucharmap/gucharmap-devel.template
+++ b/srcpkgs/gucharmap/gucharmap-devel.template
@@ -16,9 +16,8 @@ Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
Add_dependency run gdk-pixbuf-devel
Add_dependency run libpng-devel
-Add_dependency run gtk+-devel
+Add_dependency run gtk+3-devel
Add_dependency run GConf-devel
-Add_dependency run pygtk-devel
do_install()
{
diff --git a/srcpkgs/gucharmap/gucharmap-python.template b/srcpkgs/gucharmap/gucharmap-python.template
deleted file mode 100644
index 3754bf74564..00000000000
--- a/srcpkgs/gucharmap/gucharmap-python.template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'gucharmap-python'.
-#
-short_desc="${sourcepkg} - python bindings"
-long_desc="${long_desc}
-
- This package contains the Python bindings."
-
-Add_dependency run glibc
-Add_dependency run python
-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 libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run pygtk
-Add_dependency run gucharmap
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/{lib,share}
- mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share/pygtk ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index ff9fe7de30f..0174fee0257 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -1,21 +1,21 @@
# Template file for 'gucharmap'
pkgname=gucharmap
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --disable-scrollkeeper
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --enable-python-bindings"
+--localstatedir=/var --with-gtk=3.0"
short_desc="GNOME Unicode Charmap"
maintainer="Juan RP "
-checksum=fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28
+checksum=e95c161f7c229e27a7acb3d5212a95ec3564b5bc2964c1607ab32ef24f093bf0
long_desc="
gucharmap is a Unicode/ISO10646 character map and font viewer for the
GNOME platform. It supports anti-aliased, scalable fonts and more."
gconf_schemas="$pkgname.schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel $pkgname-python"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
@@ -26,7 +26,7 @@ Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run gdk-pixbuf
Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run gtk+3
Add_dependency run GConf
Add_dependency build pkg-config
@@ -40,9 +40,15 @@ Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build GConf-devel
-Add_dependency build pygtk-devel
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
diff --git a/srcpkgs/gupnp-igd-devel b/srcpkgs/gupnp-igd-devel
new file mode 120000
index 00000000000..e8929fd3af7
--- /dev/null
+++ b/srcpkgs/gupnp-igd-devel
@@ -0,0 +1 @@
+gupnp-igd
\ No newline at end of file
diff --git a/srcpkgs/gupnp-igd/depends b/srcpkgs/gupnp-igd/depends
new file mode 100644
index 00000000000..66fe7f1eda6
--- /dev/null
+++ b/srcpkgs/gupnp-igd/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.7"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gupnp-igd/gupnp-igd-devel.template b/srcpkgs/gupnp-igd/gupnp-igd-devel.template
new file mode 100644
index 00000000000..40182946b1e
--- /dev/null
+++ b/srcpkgs/gupnp-igd/gupnp-igd-devel.template
@@ -0,0 +1,23 @@
+# Template file for 'gupnp--igd-devel'.
+#
+short_desc="${short_desc} - 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 libxml2-devel
+Add_dependency run libsoup-devel
+Add_dependency run gssdp-devel
+Add_dependency run gupnp-devel
+Add_dependency run gupnp-igd
+
+do_install()
+{
+ install -d ${DESTDIR}/usr/lib
+
+ mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template
new file mode 100644
index 00000000000..136fd6f3c35
--- /dev/null
+++ b/srcpkgs/gupnp-igd/template
@@ -0,0 +1,27 @@
+# Template file for 'gupnp-igd'
+pkgname=gupnp-igd
+version=0.1.7
+distfiles="http://gupnp.org/sites/all/files/sources/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-python"
+short_desc="Library to handle UPnP IGD port mapping"
+maintainer="Juan RP "
+checksum=c1d80ed20081992fabe70331f02efe9435bbfcc79287676121a855fea6561bf6
+long_desc="
+ GUPNP-igd is is a library to handle UPnP IGD port mapping."
+
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run libsoup
+Add_dependency run gssdp
+Add_dependency run gupnp
+
+Add_dependency build pkg-config
+Add_dependency build glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build libsoup-devel
+Add_dependency build gssdp-devel
+Add_dependency build gupnp-devel
diff --git a/srcpkgs/gupnp/gir-gupnp.template b/srcpkgs/gupnp/gir-gupnp.template
deleted file mode 100644
index 91cdf7f4b9e..00000000000
--- a/srcpkgs/gupnp/gir-gupnp.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gir-gupnp'.
-#
-short_desc="Introspection data for GUPNP"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for GUPNP."
-
-Add_dependency run gir-gssdp
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index df67b768d12..2de7558c93a 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,6 +1,7 @@
# Template file for 'gupnp'
pkgname=gupnp
version=0.14.0
+revision=1
distfiles="http://gupnp.org/sites/all/files/sources/gupnp-$version.tar.gz"
build_style=gnu_configure
short_desc="GObject-based library for UPnP"
@@ -9,7 +10,7 @@ checksum=6ac13efe46c6f1e5d05e48e1041bf37dfa702839ce5fbb01e0f314f3904b6a16
long_desc="
A GObject-based API for doing UPnP transparently."
-subpackages="gir-gupnp gupnp-devel"
+subpackages="gupnp-devel"
# XXX: missing libconic dependency.
Add_dependency run glibc
diff --git a/srcpkgs/gvfs/depends b/srcpkgs/gvfs/depends
index 89acd330c29..59e51e8417d 100644
--- a/srcpkgs/gvfs/depends
+++ b/srcpkgs/gvfs/depends
@@ -1,2 +1,2 @@
-abi_depends=">=1.6.0"
+abi_depends=">=1.7.2"
api_depends="${abi_depends}"
diff --git a/srcpkgs/gvfs/gvfs-devel.template b/srcpkgs/gvfs/gvfs-devel.template
index 62d06a21235..09ebdf8f6f8 100644
--- a/srcpkgs/gvfs/gvfs-devel.template
+++ b/srcpkgs/gvfs/gvfs-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 libudev-devel
Add_dependency run expat-devel
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 61558aa06dd..86e1a8267c4 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,13 +1,12 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.6.6
-revision=2
-distfiles="${GNOME_SITE}/$pkgname/1.6/$pkgname-$version.tar.bz2"
+version=1.8.0
+distfiles="${GNOME_SITE}/$pkgname/1.8/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --disable-hal --disable-afc"
short_desc="Userspace virtual filesystem"
maintainer="Juan RP "
-checksum=902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
+checksum=45e741fdb7c7a9b4d6605851429775a1e9e7262506a4bd7b353c3b0d857c3626
long_desc="
gvfs is a userspace virtual filesystem designed to work with the i/o
abstractions of gio (a library available in glib greater than 2.15). It
@@ -15,7 +14,7 @@ long_desc="
using the APIs of libgio. There is also fuse support that allows
applications not using gio to access the gvfs filesystems."
-triggers="gio-modules"
+triggers="gio-modules gsettings-schemas"
subpackages="$pkgname-devel"
Add_dependency run glibc
@@ -39,7 +38,6 @@ Add_dependency run libsoup-gnome
Add_dependency run libgphoto2
Add_dependency run libgnome-keyring
Add_dependency run libsmbclient
-Add_dependency run GConf
Add_dependency run gnome-disk-utility
Add_dependency build pkg-config
@@ -64,7 +62,6 @@ Add_dependency build libsoup-gnome-devel
Add_dependency build libgphoto2-devel
Add_dependency build libgnome-keyring-devel
Add_dependency build samba-devel
-Add_dependency build GConf-devel
Add_dependency build gnome-disk-utility-devel
post_install()
diff --git a/srcpkgs/icu/depends b/srcpkgs/icu/depends
index a73444d7334..86a5d572caf 100644
--- a/srcpkgs/icu/depends
+++ b/srcpkgs/icu/depends
@@ -1,2 +1,2 @@
-abi_depends=">=4.2"
+abi_depends=">=4.6.1"
api_depends="${abi_depends}"
diff --git a/srcpkgs/icu/icu-devel.template b/srcpkgs/icu/icu-devel.template
index dffd6d233c0..d0a2215084a 100644
--- a/srcpkgs/icu/icu-devel.template
+++ b/srcpkgs/icu/icu-devel.template
@@ -1,16 +1,21 @@
# Template file for 'icu-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."
+Add_dependency run libstdc++-devel
Add_dependency run icu
do_install()
{
- mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
+ mkdir -p ${DESTDIR}/usr/{lib,share} ${DESTDIR}/usr/bin \
+ ${DESTDIR}/usr/share/man/man1
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/icu ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/{icu,pkgconfig} ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/icu ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/bin/icu-config ${DESTDIR}/usr/bin
+ mv ${SRCPKGDESTDIR}/usr/share/man/man1/icu-config* \
+ ${DESTDIR}/usr/share/man/man1
}
diff --git a/srcpkgs/icu/icu-libs.template b/srcpkgs/icu/icu-libs.template
index e5d67d0fb4b..ee9676196d1 100644
--- a/srcpkgs/icu/icu-libs.template
+++ b/srcpkgs/icu/icu-libs.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains the shared libraries."
-revision=2
-
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2451e89e34a..1697068b40c 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -1,13 +1,12 @@
# Template build file for 'icu'.
pkgname=icu
-version=4.2
-revision=1
+version=4.6.1
wrksrc="icu/source"
-distfiles="http://download.icu-project.org/files/icu4c/4.2/icu4c-4_2-src.tgz"
+distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-4_6_1-src.tgz"
build_style=gnu_configure
short_desc="Robust and full-featured Unicode services"
maintainer="Juan RP "
-checksum=65ab82b70614adf759b1e94324178597f703ad17878513e4802ccc4f061408a5
+checksum=6846b5e67bea5cb7f5c4b0208489498a9b14bc34f2d556cc5a99209038644874
long_desc="
The International Components for Unicode(ICU) is a C and C++ library that
provides robust and full-featured Unicode support on a wide variety of
diff --git a/srcpkgs/initramfs-tools/files/hook-functions b/srcpkgs/initramfs-tools/files/hook-functions
index bc8d164aa4d..8e0e86aa1b8 100644
--- a/srcpkgs/initramfs-tools/files/hook-functions
+++ b/srcpkgs/initramfs-tools/files/hook-functions
@@ -12,8 +12,8 @@ catenate_cpiogz() {
force_load()
{
- manual_add_modules ${@}
- echo "${@}" >>"${DESTDIR}/conf/modules"
+ manual_add_modules ${@}
+ echo "${@}" >>"${DESTDIR}/conf/modules"
}
# Takes a file containing a list of modules to be added as an
@@ -370,9 +370,6 @@ dep_add_modules()
if [ -d "${DESTDIR}/lib/modules/${version}/kernel/drivers/ide" ]; then
sys_walk_modalias ${root_dev_path}
manual_add_modules ide-gd_mod
- # FIXME: remove post Squeeze
- manual_add_modules ide-disk
- manual_add_modules ide-cd
fi
if [ -d "${DESTDIR}/lib/modules/${version}/kernel/drivers/scsi" ]; then
@@ -539,8 +536,14 @@ cache_run_scripts()
compare_versions()
{
local curv="$1" minv="$2"
+ local cmpver_cmd
- xbps-uhelper cmpver $curv $minv
+ if ! command -v xbps-uhelper.static >/dev/null 2>&1; then
+ cmpver_cmd=xbps-uhelper
+ else
+ cmpver_cmd=xbps-uhelper.static
+ fi
+ ${cmpver_cmd} cmpver $curv $minv
if [ $? -eq 0 ] || [ $? -eq 1 ]; then
return 0
fi
diff --git a/srcpkgs/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init
index 555676eb716..e3c112b0440 100755
--- a/srcpkgs/initramfs-tools/files/init
+++ b/srcpkgs/initramfs-tools/files/init
@@ -13,31 +13,23 @@ done
[ -d /sys ] || mkdir /sys
[ -d /proc ] || mkdir /proc
[ -d /tmp ] || mkdir /tmp
-mkdir -p /var/lock
mount -t sysfs -o nodev,noexec,nosuid sysfs /sys
mount -t proc -o nodev,noexec,nosuid proc /proc
# Note that this only becomes /dev on the real filesystem if udev's scripts
# are used; which they will be, but it's worth pointing out
-tmpfs_size="10M"
if [ -e /etc/udev/udev.conf ]; then
. /etc/udev/udev.conf
fi
if ! mount -t devtmpfs -o mode=0755 devtmpfs /dev; then
+ tmpfs_size="10M"
echo "W: devtmpfs not available, falling back to tmpfs for /dev"
mount -t tmpfs -o size=$tmpfs_size,mode=0755 udev /dev
[ -e /dev/console ] || mknod -m 0600 /dev/console c 5 1
[ -e /dev/null ] || mknod /dev/null c 1 3
fi
-mkdir /dev/pts
-mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
-> /dev/.initramfs-tools
mkdir /dev/.initramfs
-# Export the dpkg architecture
-export DPKG_ARCH=
-. /conf/arch.conf
-
# Set modprobe env
export MODPROBE_OPTIONS="-qb"
@@ -202,36 +194,31 @@ fi
[ -n "${netconsole}" ] && modprobe netconsole netconsole="${netconsole}"
maybe_break top
-[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-top"
+log_begin_msg "Running /scripts/init-top"
run_scripts /scripts/init-top
-[ "$quiet" != "y" ] && log_end_msg
+log_end_msg
maybe_break modules
-[ "$quiet" != "y" ] && log_begin_msg "Loading essential drivers"
+log_begin_msg "Loading essential drivers"
load_modules
-[ "$quiet" != "y" ] && log_end_msg
+log_end_msg
maybe_break premount
-[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-premount"
+log_begin_msg "Running /scripts/init-premount"
run_scripts /scripts/init-premount
-[ "$quiet" != "y" ] && log_end_msg
+log_end_msg
maybe_break mount
log_begin_msg "Mounting root file system"
. /scripts/${BOOT}
-parse_numeric ${ROOT}
maybe_break mountroot
mountroot
log_end_msg
maybe_break bottom
-[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-bottom"
+log_begin_msg "Running /scripts/init-bottom"
run_scripts /scripts/init-bottom
-[ "$quiet" != "y" ] && log_end_msg
-
-# Move virtual filesystems over to the real filesystem
-mount -n -o move /sys ${rootmnt}/sys
-umount /proc
+log_end_msg
validate_init() {
checktarget="${1}"
@@ -286,7 +273,6 @@ maybe_break init
# (keep init, rootmnt)
unset debug
unset MODPROBE_OPTIONS
-unset DPKG_ARCH
unset ROOTFLAGS
unset ROOTFSTYPE
unset ROOTDELAY
@@ -304,6 +290,10 @@ unset readonly
unset resume
unset resume_offset
+# Umount sysfs and procfs, they will be mounted by init scripts.
+umount /sys
+umount /proc
+
# Chain to real filesystem
exec switch_root ${rootmnt} ${init} "$@"
panic "Could not execute run-init."
diff --git a/srcpkgs/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs
index a01ff76eef1..2d3da59a447 100755
--- a/srcpkgs/initramfs-tools/files/mkinitramfs
+++ b/srcpkgs/initramfs-tools/files/mkinitramfs
@@ -239,21 +239,20 @@ hidden_dep_add_modules
cp -p /usr/share/initramfs-tools/init ${DESTDIR}/init
# add existant boot scripts
-for b in $(cd /usr/share/initramfs-tools/scripts/ && find . \
+for b in $(cd /usr/share/initramfs-tools/scripts/ && find -L . \
-regextype posix-extended -regex '.*/[[:alnum:]\._-]+$' -type f); do
[ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \
|| mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")"
cp -p "/usr/share/initramfs-tools/scripts/${b}" \
"${DESTDIR}/scripts/$(dirname "${b}")/"
done
-for b in $(cd "${CONFDIR}/scripts" && find . \
+for b in $(cd "${CONFDIR}/scripts" && find -L . \
-regextype posix-extended -regex '.*/[[:alnum:]\._-]+$' -type f); do
[ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \
|| mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")"
cp -p "${CONFDIR}/scripts/${b}" "${DESTDIR}/scripts/$(dirname "${b}")/"
done
-echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf
cp -p "${CONFDIR}/initramfs.conf" ${DESTDIR}/conf
for i in ${EXTRA_CONF}; do
if [ -e "${CONFDIR}/conf.d/${i}" ]; then
diff --git a/srcpkgs/initramfs-tools/files/scripts/functions b/srcpkgs/initramfs-tools/files/scripts/functions
index 4e284ad2559..09fca7d0fc9 100644
--- a/srcpkgs/initramfs-tools/files/scripts/functions
+++ b/srcpkgs/initramfs-tools/files/scripts/functions
@@ -2,7 +2,7 @@
_log_msg()
{
- if [ "$quiet" = "y" ]; then return; fi
+ [ "$quiet" = "y" ] && return
printf "\033[1m"
printf "$@"
printf "\033[m\n"
@@ -25,26 +25,16 @@ log_warning_msg()
log_begin_msg()
{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TEXT $@"
- fi
_log_msg "$@ ..."
}
log_end_msg()
{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "SUCCESS ok"
- fi
:
}
panic()
{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "QUIT"
- fi
-
if command -v chvt >/dev/null 2>&1; then
chvt 1
fi
@@ -271,33 +261,6 @@ load_modules()
fi
}
-# lilo compatibility
-parse_numeric() {
- case $1 in
- "")
- return
- ;;
- /*)
- return
- ;;
- [0-9]*:[0-9]*)
- minor=${1#*:}
- major=${1%:*}
- ;;
- [A-Fa-f0-9]*)
- value=$(( 0x${1} ))
- minor=$(( ${value} % 256 ))
- major=$(( ${value} / 256 ))
- ;;
- *)
- return
- ;;
- esac
-
- mknod -m 600 /dev/root b ${major} ${minor}
- ROOT=/dev/root
-}
-
# Parameter: device node to check
# Echos fstype to stdout
# Return value: indicates if an fs could be recognized
@@ -306,13 +269,7 @@ get_fstype ()
local FS FSTYPE FSSIZE RET
FS="${1}"
- # vol_id has a more complete list of file systems,
- # but fstype is more robust
- if command -v blkid >/dev/null 2>&1 ; then
- FSTYPE=$(blkid -o value -s TYPE "${FS}")
- elif [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
- FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
- fi
+ FSTYPE=$(blkid -o value -s TYPE "${FS}")
RET=$?
if [ -z "${FSTYPE}" ]; then
diff --git a/srcpkgs/initramfs-tools/files/scripts/local b/srcpkgs/initramfs-tools/files/scripts/local
index 8cb279a1ef7..3d76abcccf1 100644
--- a/srcpkgs/initramfs-tools/files/scripts/local
+++ b/srcpkgs/initramfs-tools/files/scripts/local
@@ -2,9 +2,9 @@
pre_mountroot()
{
- [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
+ log_begin_msg "Running /scripts/local-top"
run_scripts /scripts/local-top
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
wait_for_udev 10
@@ -29,10 +29,6 @@ pre_mountroot()
# Default delay is 30s
slumber=${ROOTDELAY:-30}
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TIMEOUT ${slumber}" || true
- fi
-
slumber=$(( ${slumber} * 10 ))
while [ ! -e "${ROOT}" ] \
|| ! $(get_fstype "${ROOT}" >/dev/null); do
@@ -46,9 +42,6 @@ pre_mountroot()
else
log_end_msg 1 || true
fi
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TIMEOUT 15" || true
- fi
fi
# We've given up, but we'll let the user fix matters if they can
@@ -92,9 +85,9 @@ mountroot()
FSTYPE=${ROOTFSTYPE}
fi
- [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
+ log_begin_msg "Running /scripts/local-premount"
run_scripts /scripts/local-premount
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
if [ "${readonly}" = "y" ]; then
roflag=-r
@@ -113,7 +106,7 @@ mountroot()
mount ${roflag} ${ROOTFLAGS} ${ROOT} ${rootmnt}
fi
- [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-bottom"
+ log_begin_msg "Running /scripts/local-bottom"
run_scripts /scripts/local-bottom
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
}
diff --git a/srcpkgs/initramfs-tools/files/update-initramfs b/srcpkgs/initramfs-tools/files/update-initramfs
index c0f775d1574..a11531fe271 100755
--- a/srcpkgs/initramfs-tools/files/update-initramfs
+++ b/srcpkgs/initramfs-tools/files/update-initramfs
@@ -341,8 +341,6 @@ update()
generate_initramfs
- [ -n "${dogrub}" ] && run_bootloader
-
backup_booted_initramfs
}
@@ -371,6 +369,8 @@ delete()
delete_sha1
rm -f "${initramfs}" "${initramfs}.bak"
+
+ [ -n "${dogrub}" ] && run_bootloader
}
# Check for update mode on existing and modified initramfs
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 2b553685cdb..ebe247d8644 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
# Template file for 'initramfs-tools'
pkgname=initramfs-tools
-_localver=0.99.8.4 # This is the XBPS version
+_localver=0.99.10 # This is the XBPS version
_distver=0.98.8 # This should match debian version
version=${_localver}.${_distver}
build_style=custom-install
diff --git a/srcpkgs/json-glib/gir-json-glib.template b/srcpkgs/json-glib/gir-json-glib.template
deleted file mode 100644
index 95d750125de..00000000000
--- a/srcpkgs/json-glib/gir-json-glib.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-json-glib'.
-#
-short_desc="Introspection data for json-glib"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- json-glib library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index b26ca6bdd75..5281223d861 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,7 @@
# Template build file for 'json-glib'.
pkgname=json-glib
version=0.12.2
+revision=1
distfiles="${GNOME_SITE}/${pkgname}/0.12/${pkgname}-${version}.tar.bz2"
build_style=gnu_configure
short_desc="A JSON parser for GLib-based libraries and applications"
@@ -14,7 +15,7 @@ long_desc="
integration, providing the ability to serialize and deserialize
GObject instances to and from JSON data types."
-subpackages="gir-${pkgname} ${pkgname}-devel"
+subpackages="${pkgname}-devel"
Add_dependency run glibc
Add_dependency run glib
Add_dependency build pkg-config
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index 247126af462..3022aaea49a 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -2,7 +2,7 @@
. ${XBPS_SRCPKGDIR}/kernel/common-vars
pkgname=kernel-libc-headers
-#revision=1
+revision=1
build_style=custom-install
short_desc="The Linux kernel headers for development"
long_desc="
@@ -13,14 +13,15 @@ nostrip=yes
do_build()
{
- make headers_check || return 1
+ make headers_check
}
do_install()
{
- make INSTALL_HDR_PATH=${DESTDIR}/usr headers_install || return 1
+ make INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
# Install scsi/scsi.h header, required by eject and others.
- install -m644 ${wrksrc}/include/scsi/scsi.h ${DESTDIR}/usr/include/scsi
+ sed -i -e "/^\#include $/d" include/scsi/scsi.h
+ install -m644 include/scsi/scsi.h ${DESTDIR}/usr/include/scsi
}
post_install()
diff --git a/srcpkgs/kernel-snapshot/INSTALL b/srcpkgs/kernel-snapshot/INSTALL
index ad21707fb05..ce13a689c40 100644
--- a/srcpkgs/kernel-snapshot/INSTALL
+++ b/srcpkgs/kernel-snapshot/INSTALL
@@ -1,7 +1,7 @@
#
# This script builds the required initramfs.
#
-_KVER="2.6.38-rc7"
+_KVER="2.6.39-rc1"
case "${ACTION}" in
post)
diff --git a/srcpkgs/kernel-snapshot/REMOVE b/srcpkgs/kernel-snapshot/REMOVE
index 2322ea36ba0..4ed6a89f50b 100644
--- a/srcpkgs/kernel-snapshot/REMOVE
+++ b/srcpkgs/kernel-snapshot/REMOVE
@@ -1,7 +1,7 @@
#
# This script removes the initramfs.
#
-_KVER="2.6.38-rc7"
+_KVER="2.6.39-rc1"
case "${ACTION}" in
post)
diff --git a/srcpkgs/kernel-snapshot/files/i386-dotconfig b/srcpkgs/kernel-snapshot/files/i386-dotconfig
deleted file mode 100644
index 9b61e99e721..00000000000
--- a/srcpkgs/kernel-snapshot/files/i386-dotconfig
+++ /dev/null
@@ -1,4948 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc8 Kernel Configuration
-# Wed Dec 29 10:27:46 2010
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=64
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_PERF_COUNTERS is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_EVENT_MULTIPLEX=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=y
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-# CONFIG_K8_NUMA is not set
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_INTR_REMAP=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_RENO=y
-CONFIG_DEFAULT_TCP_CONG="reno"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_LAPB=m
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_RPS=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
-CONFIG_CAN_MCP251X=m
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_PCH_CAN=m
-CONFIG_CAN_SJA1000=m
-# CONFIG_CAN_SJA1000_PLATFORM is not set
-# CONFIG_CAN_EMS_PCI is not set
-# CONFIG_CAN_KVASER_PCI is not set
-# CONFIG_CAN_PLX_PCI is not set
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_RDMA is not set
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_PARTITIONS is not set
-
-#
-# User Modules And Translation Layers
-#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_PCH_PHUB=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-# CONFIG_STMMAC_DUAL_MAC is not set
-# CONFIG_PCH_GBE is not set
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-# CONFIG_CAIF_SPI_SYNC is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-# CONFIG_ISDN is not set
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_XEN_KBDDEV_FRONTEND=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
-# CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MRST_MAX3110=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_ALGOPCF is not set
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_INTEL_MID=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO expanders:
-#
-CONFIG_GPIO_BASIC_MMIO=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_GPIO_UCB1400 is not set
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_PKGTEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-# CONFIG_MFD_WM831X_SPI is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_STREAMZAP=m
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRX397XD is not set
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=m
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-CONFIG_FB_SM501=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_3M_PCT=m
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX_FF=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CANDO=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EGALAX=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-# CONFIG_LOGIWII_FF is not set
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MOSART=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SAMBA=m
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
-CONFIG_USB_SERIAL_SSU100=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-# CONFIG_USB_FUNCTIONFS_ETH is not set
-# CONFIG_USB_FUNCTIONFS_RNDIS is not set
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_G_NOKIA=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_RICOH_MMC is not set
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_USHC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_MCE=y
-CONFIG_EDAC_AMD64=m
-CONFIG_EDAC_AMD64_ERROR_INJECTION=y
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_PCAP=m
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_PLATFORM_PCI=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
-# CONFIG_BRCMFMAC is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-# CONFIG_R8712_AP is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_VME_BUS=m
-
-#
-# VME Bridge Drivers
-#
-CONFIG_VME_CA91CX42=m
-CONFIG_VME_TSI148=m
-
-#
-# VME Device Drivers
-#
-CONFIG_VME_USER=m
-
-#
-# VME Board Drivers
-#
-CONFIG_VMIVME_7805=m
-CONFIG_IIO=m
-CONFIG_IIO_RING_BUFFER=y
-CONFIG_IIO_SW_RING=m
-CONFIG_IIO_TRIGGER=y
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16209=m
-CONFIG_ADIS16220=m
-CONFIG_ADIS16240=m
-CONFIG_KXSD9=m
-CONFIG_LIS3L02DQ=m
-CONFIG_SCA3000=m
-
-#
-# Analog to digital convertors
-#
-CONFIG_MAX1363=m
-CONFIG_MAX1363_RING_BUFFER=y
-CONFIG_AD799X=m
-CONFIG_AD799X_RING_BUFFER=y
-CONFIG_AD7476=m
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_ADIS16260=m
-
-#
-# Inertial measurement units
-#
-CONFIG_ADIS16300=m
-CONFIG_ADIS16350=m
-CONFIG_ADIS16400=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_TSL2563=m
-CONFIG_SENSORS_ISL29018=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_AK8975=m
-CONFIG_SENSORS_HMC5843=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-CONFIG_IIO_GPIO_TRIGGER=m
-CONFIG_ZRAM=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
-CONFIG_FB_XGI=m
-# CONFIG_LIRC_STAGING is not set
-# CONFIG_SOLO6X10 is not set
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-# CONFIG_ATH6K_LEGACY is not set
-# CONFIG_USB_ENESTORAGE is not set
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZO=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_EXOFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_DEPRECATED=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CEPH_FS=m
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-# CONFIG_9P_FS_POSIX_ACL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_LKDTM=m
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_RING_BUFFER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_OPTIMIZE_INLINING is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY_DMESG_RESTRICT=y
-# CONFIG_SECURITY is not set
-CONFIG_SECURITYFS=y
-CONFIG_INTEL_TXT=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_FPU=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_VHOST_NET=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
index 246ca5b6124..88bac0d74d5 100644
--- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
+++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.38-rc6 Kernel Configuration
-# Tue Feb 22 08:35:56 2011
+# Linux/x86_64 2.6.39-rc1 Kernel Configuration
+# Wed Mar 30 09:40:52 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -50,7 +50,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
# CONFIG_KTIME_SCALAR is not set
CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -84,6 +83,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
CONFIG_HAVE_GENERIC_HARDIRQS=y
@@ -92,13 +92,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
# IRQ subsystem
#
CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
CONFIG_HAVE_SPARSE_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
# CONFIG_SPARSE_IRQ is not set
#
@@ -126,6 +124,7 @@ CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
+CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
@@ -292,6 +291,7 @@ CONFIG_XEN_PVHVM=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=128
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
+# CONFIG_XEN_DEBUG is not set
CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
CONFIG_PARAVIRT=y
@@ -304,7 +304,6 @@ CONFIG_NO_BOOTMEM=y
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=7
CONFIG_X86_CMPXCHG=y
CONFIG_CMPXCHG_LOCAL=y
@@ -430,16 +429,15 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
# Power management and ACPI options
#
CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
@@ -470,6 +468,7 @@ CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=m
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_APEI_ERST_DEBUG=m
CONFIG_SFI=y
@@ -570,6 +569,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_RAPIDIO_TSI500=y
+CONFIG_RAPIDIO_DEBUG=y
#
# Executable file formats / Emulations
@@ -584,6 +592,7 @@ CONFIG_IA32_AOUT=m
CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -604,12 +613,11 @@ CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
@@ -687,6 +695,7 @@ CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@@ -695,7 +704,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m
@@ -709,6 +720,7 @@ CONFIG_NETFILTER_XTABLES=m
#
CONFIG_NETFILTER_XT_MARK=m
CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
#
# Xtables targets
@@ -735,6 +747,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
#
# Xtables matches
#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -743,6 +756,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_NETFILTER_XT_MATCH_CPU=m
CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -772,6 +786,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_VS=m
# CONFIG_IP_VS_IPV6 is not set
# CONFIG_IP_VS_DEBUG is not set
@@ -816,7 +842,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_TTL=m
@@ -937,11 +962,18 @@ CONFIG_VLAN_8021Q=m
# CONFIG_DECNET is not set
CONFIG_LLC=m
CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+# CONFIG_IPDDP_ENCAP is not set
+# CONFIG_IPDDP_DECAP is not set
+CONFIG_X25=m
CONFIG_LAPB=m
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=m
CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
CONFIG_IEEE802154=m
CONFIG_NET_SCHED=y
@@ -955,6 +987,7 @@ CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_MULTIQ=m
CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
@@ -962,6 +995,8 @@ CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_INGRESS=m
#
@@ -971,7 +1006,6 @@ CONFIG_NET_CLS=y
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
# CONFIG_CLS_U32_PERF is not set
@@ -999,6 +1033,7 @@ CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
#
@@ -1025,6 +1060,8 @@ CONFIG_CAN_SJA1000=m
# CONFIG_CAN_EMS_PCI is not set
# CONFIG_CAN_KVASER_PCI is not set
# CONFIG_CAN_PLX_PCI is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
#
# CAN USB interfaces
@@ -1091,8 +1128,8 @@ CONFIG_VLSI_FIR=m
CONFIG_VIA_FIR=m
CONFIG_MCS_FIR=m
CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
@@ -1121,6 +1158,7 @@ CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
CONFIG_AF_RXRPC=m
# CONFIG_AF_RXRPC_DEBUG is not set
CONFIG_RXKAD=m
@@ -1186,18 +1224,18 @@ CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
CONFIG_SYS_HYPERVISOR=y
+CONFIG_ARCH_NO_SYSDEV_OPS=y
CONFIG_CONNECTOR=m
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_CONCAT is not set
# CONFIG_MTD_PARTITIONS is not set
#
# User Modules And Translation Layers
#
# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
+CONFIG_MTD_BLKDEVS=m
# CONFIG_MTD_BLOCK is not set
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
@@ -1207,6 +1245,7 @@ CONFIG_MTD=m
# CONFIG_SSFDC is not set
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
#
# RAM/ROM/Flash chip drivers
@@ -1307,6 +1346,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
CONFIG_MISC_DEVICES=y
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
@@ -1357,6 +1397,7 @@ CONFIG_IWMC3200TOP=m
# Texas Instruments shared transport line discipline
#
CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1399,7 +1440,6 @@ CONFIG_SCSI_SAS_ATTRS=m
CONFIG_SCSI_SAS_LIBSAS=m
CONFIG_SCSI_SAS_ATA=y
CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
CONFIG_SCSI_SRP_ATTRS=m
CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_LOWLEVEL=y
@@ -1408,6 +1448,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
CONFIG_BE2ISCSI=m
CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_SCSI_HPSA=m
@@ -1543,6 +1584,7 @@ CONFIG_SATA_VITESSE=m
#
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -1619,10 +1661,13 @@ CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1764,7 +1809,6 @@ CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
@@ -1787,11 +1831,8 @@ CONFIG_NETDEV_10000=y
CONFIG_MDIO=m
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
CONFIG_CHELSIO_T4VF=m
CONFIG_ENIC=m
CONFIG_IXGBE=m
@@ -1894,15 +1935,20 @@ CONFIG_IPW2200_QOS=y
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+CONFIG_IWL_P2P=y
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+CONFIG_IWL4965=m
CONFIG_IWL3945=m
CONFIG_IWM=m
# CONFIG_IWM_DEBUG is not set
@@ -1936,6 +1982,7 @@ CONFIG_RT61PCI=m
CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
@@ -1952,7 +1999,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
@@ -2059,6 +2108,10 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
# CONFIG_CAIF_SPI_SYNC is not set
CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
CONFIG_PLIP=m
@@ -2110,7 +2163,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
-CONFIG_XEN_KBDDEV_FRONTEND=m
#
# Input Device Drivers
@@ -2118,6 +2170,7 @@ CONFIG_XEN_KBDDEV_FRONTEND=m
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_GPIO is not set
@@ -2192,6 +2245,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2206,7 +2260,6 @@ CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
# CONFIG_TOUCHSCREEN_UCB1400 is not set
@@ -2233,6 +2286,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_PCAP is not set
CONFIG_TOUCHSCREEN_ST1232=m
@@ -2261,6 +2315,7 @@ CONFIG_INPUT_ADXL34X_I2C=m
CONFIG_INPUT_ADXL34X_SPI=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
#
# Hardware I/O ports
@@ -2289,25 +2344,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
CONFIG_MOXA_INTELLIO=m
CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
CONFIG_N_HDLC=m
CONFIG_N_GSM=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
+CONFIG_DEVKMEM=y
# CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
#
# Serial drivers
@@ -2340,9 +2394,6 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
CONFIG_SERIAL_IFX6X60=m
CONFIG_SERIAL_PCH_UART=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2440,6 +2491,7 @@ CONFIG_I2C_GPIO=m
CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
CONFIG_I2C_SIMTEC=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_EG20T=m
@@ -2447,6 +2499,7 @@ CONFIG_I2C_EG20T=m
#
# External I2C/SMBus adapter drivers
#
+CONFIG_I2C_DIOLAN_U2C=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
@@ -2465,10 +2518,12 @@ CONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
+CONFIG_SPI_ALTERA=m
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
CONFIG_SPI_GPIO=m
CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
# CONFIG_SPI_PXA2XX_PCI is not set
CONFIG_SPI_TOPCLIFF_PCH=m
CONFIG_SPI_XILINX=m
@@ -2499,7 +2554,6 @@ CONFIG_PPS_CLIENT_PARPORT=m
#
# PPS generators support
#
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
@@ -2579,6 +2633,8 @@ CONFIG_BATTERY_DS2760=m
CONFIG_BATTERY_DS2782=m
CONFIG_BATTERY_BQ20Z75=m
CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
CONFIG_BATTERY_MAX17040=m
CONFIG_BATTERY_MAX17042=m
CONFIG_CHARGER_PCF50633=m
@@ -2628,6 +2684,7 @@ CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM70=m
CONFIG_SENSORS_LM73=m
@@ -2641,16 +2698,23 @@ CONFIG_SENSORS_LM87=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_MAX1111=m
CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SIS5595=m
@@ -2661,6 +2725,8 @@ CONFIG_SENSORS_EMC2103=m
CONFIG_SENSORS_SMSC47M1=m
CONFIG_SENSORS_SMSC47M192=m
CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_ADS7871=m
CONFIG_SENSORS_AMC6821=m
@@ -2682,7 +2748,6 @@ CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3_I2C=m
CONFIG_SENSORS_APPLESMC=m
CONFIG_SENSORS_MC13783_ADC=m
@@ -2690,7 +2755,6 @@ CONFIG_SENSORS_MC13783_ADC=m
# ACPI drivers
#
CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
CONFIG_THERMAL=m
CONFIG_THERMAL_HWMON=y
CONFIG_WATCHDOG=y
@@ -2735,6 +2799,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_XEN_WDT=m
#
# PCI-based Watchdog Cards
@@ -2770,6 +2835,7 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
+CONFIG_TPS6105X=m
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
# CONFIG_MFD_TMIO is not set
@@ -2784,6 +2850,7 @@ CONFIG_ABX500_CORE=y
CONFIG_EZX_PCAP=y
CONFIG_AB8500_CORE=y
CONFIG_AB8500_DEBUG=y
+CONFIG_AB8500_GPADC=y
CONFIG_MFD_CS5535=m
CONFIG_MFD_TIMBERDALE=m
CONFIG_LPC_SCH=m
@@ -2810,6 +2877,7 @@ CONFIG_REGULATOR_PCAP=m
CONFIG_REGULATOR_MC13XXX_CORE=m
CONFIG_REGULATOR_MC13783=m
CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_TPS6105X=m
CONFIG_REGULATOR_TPS65023=m
CONFIG_REGULATOR_TPS6507X=m
CONFIG_REGULATOR_ISL6271A=m
@@ -2821,6 +2889,7 @@ CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support
#
+# CONFIG_MEDIA_CONTROLLER is not set
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_DVB_CORE=m
@@ -2844,6 +2913,7 @@ CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_ENE=m
CONFIG_IR_IMON=m
CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
CONFIG_IR_NUVOTON=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
@@ -2880,6 +2950,9 @@ CONFIG_VIDEO_BTCX=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_VIDEO_TUNER=m
CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -2989,6 +3062,7 @@ CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_IVTV=m
CONFIG_VIDEO_FB_IVTV=m
@@ -2998,6 +3072,7 @@ CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_SR030PC30=m
CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_IMX074=m
CONFIG_SOC_CAMERA_MT9M001=m
@@ -3012,6 +3087,7 @@ CONFIG_SOC_CAMERA_OV2640=m
CONFIG_SOC_CAMERA_OV6650=m
CONFIG_SOC_CAMERA_OV772X=m
CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
CONFIG_V4L_USB_DRIVERS=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3028,6 +3104,7 @@ CONFIG_USB_GSPCA_JEILINJ=m
CONFIG_USB_GSPCA_KONICA=m
CONFIG_USB_GSPCA_MARS=m
CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
CONFIG_USB_GSPCA_OV519=m
CONFIG_USB_GSPCA_OV534=m
CONFIG_USB_GSPCA_OV534_9=m
@@ -3054,6 +3131,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
CONFIG_USB_GSPCA_TV8532=m
CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_GSPCA_ZC3XX=m
CONFIG_VIDEO_PVRUSB2=m
@@ -3095,6 +3173,11 @@ CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
CONFIG_RADIO_TIMBERDALE=m
CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
CONFIG_DVB_MAX_ADAPTERS=8
# CONFIG_DVB_DYNAMIC_MINORS is not set
CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3146,6 +3229,7 @@ CONFIG_DVB_USB_FRIIO=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_AZ6027=m
CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
CONFIG_DVB_TTUSB_BUDGET=m
CONFIG_DVB_TTUSB_DEC=m
CONFIG_SMS_SIANO_MDTV=m
@@ -3363,6 +3447,7 @@ CONFIG_FB_CIRRUS=m
CONFIG_FB_PM2=m
CONFIG_FB_PM2_FIFO_DISCONNECT=y
CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
# CONFIG_FB_ARC is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_UVESA=m
@@ -3437,11 +3522,12 @@ CONFIG_LCD_TDO24M=m
CONFIG_LCD_VGG2432A4=m
CONFIG_LCD_PLATFORM=m
CONFIG_LCD_S6E63M0=m
+CONFIG_LCD_LD9040=m
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_APPLE=m
CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_ADP8860=m
CONFIG_BACKLIGHT_PCF50633=m
@@ -3628,6 +3714,7 @@ CONFIG_SND_USB_USX2Y=m
CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -3653,6 +3740,7 @@ CONFIG_USB_HIDDEV=y
#
CONFIG_HID_3M_PCT=m
CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=m
CONFIG_HID_APPLE=m
CONFIG_HID_BELKIN=m
@@ -3664,15 +3752,16 @@ CONFIG_HID_CYPRESS=m
CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
-CONFIG_HID_EGALAX=m
CONFIG_HID_ELECOM=m
CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
CONFIG_HID_LOGITECH=m
CONFIG_LOGITECH_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -3695,8 +3784,11 @@ CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
CONFIG_HID_QUANTA=m
CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
CONFIG_HID_ROCCAT_KONE=m
CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
CONFIG_HID_ROCCAT_PYRA=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
@@ -3778,6 +3870,7 @@ CONFIG_USB_TMC=m
#
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
CONFIG_USB_STORAGE_DATAFAB=m
CONFIG_USB_STORAGE_FREECOM=m
CONFIG_USB_STORAGE_ISD200=m
@@ -3789,6 +3882,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
CONFIG_USB_UAS=m
# CONFIG_USB_LIBUSUAL is not set
@@ -3904,6 +3998,7 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_FUSB300 is not set
# CONFIG_USB_GADGET_R8A66597 is not set
# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
@@ -3997,12 +4092,14 @@ CONFIG_MSPRO_BLOCK=m
#
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
#
# LED drivers
#
+CONFIG_LEDS_LM3530=m
CONFIG_LEDS_NET5501=m
CONFIG_LEDS_ALIX2=m
CONFIG_LEDS_PCA9532=m
@@ -4198,26 +4295,45 @@ CONFIG_XEN_COMPAT_XENFS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_XENBUS_FRONTEND=m
CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_XEN_PLATFORM_PCI=m
CONFIG_SWIOTLB_XEN=y
CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_DIGIEPCA=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_COMPUTONE=m
CONFIG_ET131X=m
# CONFIG_ET131X_DEBUG is not set
CONFIG_SLICOSS=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_GO7007_OV7640=m
+CONFIG_VIDEO_GO7007_SAA7113=m
+CONFIG_VIDEO_GO7007_SAA7115=m
+CONFIG_VIDEO_GO7007_TW9903=m
+CONFIG_VIDEO_GO7007_UDA1342=m
+CONFIG_VIDEO_GO7007_SONY_TUNER=m
+CONFIG_VIDEO_GO7007_TW2804=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_USB_DABUSB=m
-CONFIG_USB_SE401=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
+CONFIG_DVB_CXD2099=m
+CONFIG_USB_IP_COMMON=m
+CONFIG_USB_IP_VHCI_HCD=m
+CONFIG_USB_IP_HOST=m
+# CONFIG_USB_IP_DEBUG_ENABLE is not set
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+CONFIG_BRCMSMAC=y
# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
CONFIG_RT2860=m
CONFIG_RT2870=m
CONFIG_COMEDI=m
@@ -4312,6 +4428,8 @@ CONFIG_RTL8192U=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
# CONFIG_R8712_AP is not set
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_POHMELFS=m
# CONFIG_POHMELFS_DEBUG is not set
@@ -4343,6 +4461,7 @@ CONFIG_HYPERV_STORAGE=m
CONFIG_HYPERV_BLOCK=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
CONFIG_VME_BUS=m
#
@@ -4364,6 +4483,7 @@ CONFIG_DX_SEP=m
CONFIG_IIO=m
CONFIG_IIO_RING_BUFFER=y
CONFIG_IIO_SW_RING=m
+CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO_TRIGGER=y
#
@@ -4377,6 +4497,8 @@ CONFIG_ADIS16220=m
CONFIG_ADIS16240=m
CONFIG_KXSD9=m
CONFIG_LIS3L02DQ=m
+CONFIG_LIS3L02DQ_BUF_KFIFO=y
+# CONFIG_LIS3L02DQ_BUF_RING_SW is not set
CONFIG_SCA3000=m
#
@@ -4389,6 +4511,9 @@ CONFIG_AD7152=m
CONFIG_AD7291=m
CONFIG_AD7298=m
CONFIG_AD7314=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
CONFIG_AD799X=m
CONFIG_AD799X_RING_BUFFER=y
CONFIG_AD7476=m
@@ -4411,6 +4536,7 @@ CONFIG_ADT7316_I2C=m
#
CONFIG_AD5624R_SPI=m
CONFIG_AD5446=m
+CONFIG_MAX517=m
#
# Direct Digital Synthesis
@@ -4430,7 +4556,6 @@ CONFIG_ADIS16060=m
CONFIG_ADIS16080=m
CONFIG_ADIS16130=m
CONFIG_ADIS16260=m
-CONFIG_ADIS16251=m
#
# Inertial measurement units
@@ -4477,7 +4602,10 @@ CONFIG_AD2S1210_GPIO_NONE=y
#
CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
CONFIG_IIO_GPIO_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+CONFIG_XVMALLOC=y
CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
CONFIG_SAMSUNG_LAPTOP=m
@@ -4485,14 +4613,12 @@ CONFIG_FB_SM7XX=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_CRYSTALHD=m
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=m
CONFIG_FB_XGI=m
# CONFIG_LIRC_STAGING is not set
CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
# CONFIG_SOLO6X10 is not set
CONFIG_ACPI_QUICKSTART=m
CONFIG_MACH_NO_WESTBRIDGE=y
@@ -4501,6 +4627,7 @@ CONFIG_MACH_NO_WESTBRIDGE=y
CONFIG_BCM_WIMAX=m
CONFIG_FT1000=m
CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
#
# Speakup console speech
@@ -4523,14 +4650,22 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_DRM_PSB=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
CONFIG_FUJITSU_LAPTOP=m
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_ACCEL=m
CONFIG_HP_WMI=m
CONFIG_MSI_LAPTOP=m
CONFIG_PANASONIC_LAPTOP=m
@@ -4548,6 +4683,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_SENSORS_HDAPS=m
CONFIG_INTEL_MENLOW=m
CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
CONFIG_EEEPC_WMI=m
CONFIG_ACPI_WMI=m
CONFIG_MSI_WMI=m
@@ -4558,6 +4695,7 @@ CONFIG_TOSHIBA_BT_RFKILL=m
CONFIG_ACPI_CMPC=m
CONFIG_INTEL_IPS=m
CONFIG_IBM_RTL=m
+CONFIG_XO15_EBOOK=m
#
# Firmware Drivers
@@ -4569,8 +4707,10 @@ CONFIG_EFI_VARS=m
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m
+CONFIG_SIGMA=m
#
# File systems
@@ -4623,7 +4763,7 @@ CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -4690,6 +4830,8 @@ CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_CONFIGFS_FS=m
CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
# CONFIG_AFFS_FS is not set
CONFIG_ECRYPT_FS=m
# CONFIG_HFS_FS is not set
@@ -4711,7 +4853,11 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_OMFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
# CONFIG_EXOFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -4789,7 +4935,7 @@ CONFIG_LDM_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=m
+CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
@@ -4837,6 +4983,7 @@ CONFIG_DLM=m
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=1024
@@ -4845,11 +4992,11 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
# CONFIG_SPARSE_RCU_POINTER is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_MEMORY_INIT=y
@@ -4879,6 +5026,7 @@ CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_TEST_KSTRTOX=m
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
@@ -5096,6 +5244,7 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index ad3e583e7e5..4b0b7e53831 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -10,14 +10,13 @@ pkgname=kernel-snapshot
#revision=1
_kernel_headers_revision=${revision}
_kernel_snapshot=yes
-_kernel_ver=2.6.38
-_kernel_patch_ver=rc7
+_kernel_ver=2.6.39
+_kernel_patch_ver=rc1
version=${_kernel_ver}${_kernel_patch_ver}
wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
-checksum=ac37633c0a2527eb6c8504f434c3bca15e7472bd1f2af1afac19d44393e633d4
+checksum=18e64ef59cdcfb84828e43303f593086f7c9c9b32777b2a20c3ce39ee7f92662
subpackages="$pkgname-headers"
-
noverifyrdeps=yes
Add_dependency run linux-firmware
diff --git a/srcpkgs/kernel/common-vars b/srcpkgs/kernel/common-vars
index 360640549db..ae9103857ad 100644
--- a/srcpkgs/kernel/common-vars
+++ b/srcpkgs/kernel/common-vars
@@ -1,10 +1,10 @@
# Common vars shared by the 'kernel' and 'kernel-libc-headers'
# build templates.
-_kernel_ver=2.6.37.2
-version=${_kernel_ver}
-#_kernel_patch_ver=3
-#version=${_kernel_ver}.${_kernel_patch_ver}
+_kernel_ver=2.6.38
+#version=${_kernel_ver}
+_kernel_patch_ver=2
+version=${_kernel_ver}.${_kernel_patch_ver}
wrksrc="linux-$version"
distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
maintainer="Juan RP "
-checksum=2920c4cd3e87fe40ebee96d28779091548867e1c36f71c1fc3d07e6d5802161f
+checksum=552714c6315dd2dddc4c88c416794f4159e77b5aa9f689925c6d93b4d67c4d1d
diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig
deleted file mode 100644
index 9b61e99e721..00000000000
--- a/srcpkgs/kernel/files/i386-dotconfig
+++ /dev/null
@@ -1,4948 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc8 Kernel Configuration
-# Wed Dec 29 10:27:46 2010
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
-# CONFIG_SPARSE_IRQ is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=64
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_PERF_COUNTERS is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_EVENT_MULTIPLEX=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=y
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-# CONFIG_K8_NUMA is not set
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_INTR_REMAP=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_RENO=y
-CONFIG_DEFAULT_TCP_CONG="reno"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_LAPB=m
-# CONFIG_ECONET is not set
-CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_RPS=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
-CONFIG_CAN_MCP251X=m
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_PCH_CAN=m
-CONFIG_CAN_SJA1000=m
-# CONFIG_CAN_SJA1000_PLATFORM is not set
-# CONFIG_CAN_EMS_PCI is not set
-# CONFIG_CAN_KVASER_PCI is not set
-# CONFIG_CAN_PLX_PCI is not set
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_RDMA is not set
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_PARTITIONS is not set
-
-#
-# User Modules And Translation Layers
-#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_PCH_PHUB=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MULTICORE_RAID456=y
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_HP100=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-# CONFIG_STMMAC_DUAL_MAC is not set
-# CONFIG_PCH_GBE is not set
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-CONFIG_ATM_NICSTAR_USE_SUNI=y
-CONFIG_ATM_NICSTAR_USE_IDT77105=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-# CONFIG_CAIF_SPI_SYNC is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-# CONFIG_ISDN is not set
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_XEN_KBDDEV_FRONTEND=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
-# CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MRST_MAX3110=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-# CONFIG_I2C_ALGOPCF is not set
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_INTEL_MID=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO expanders:
-#
-CONFIG_GPIO_BASIC_MMIO=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-# CONFIG_GPIO_UCB1400 is not set
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_PKGTEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-# CONFIG_MFD_WM831X_SPI is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_STREAMZAP=m
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRX397XD is not set
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=m
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-CONFIG_FB_TMIO=m
-CONFIG_FB_TMIO_ACCELL=y
-CONFIG_FB_SM501=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_3M_PCT=m
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX_FF=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CANDO=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EGALAX=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-# CONFIG_LOGIWII_FF is not set
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MOSART=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SAMBA=m
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
-CONFIG_USB_SERIAL_SSU100=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-# CONFIG_USB_FUNCTIONFS_ETH is not set
-# CONFIG_USB_FUNCTIONFS_RNDIS is not set
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_G_NOKIA=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_RICOH_MMC is not set
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_USHC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_MCE=y
-CONFIG_EDAC_AMD64=m
-CONFIG_EDAC_AMD64_ERROR_INJECTION=y
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_PCAP=m
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_PLATFORM_PCI=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
-# CONFIG_BRCMFMAC is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-# CONFIG_R8712_AP is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_VME_BUS=m
-
-#
-# VME Bridge Drivers
-#
-CONFIG_VME_CA91CX42=m
-CONFIG_VME_TSI148=m
-
-#
-# VME Device Drivers
-#
-CONFIG_VME_USER=m
-
-#
-# VME Board Drivers
-#
-CONFIG_VMIVME_7805=m
-CONFIG_IIO=m
-CONFIG_IIO_RING_BUFFER=y
-CONFIG_IIO_SW_RING=m
-CONFIG_IIO_TRIGGER=y
-
-#
-# Accelerometers
-#
-CONFIG_ADIS16209=m
-CONFIG_ADIS16220=m
-CONFIG_ADIS16240=m
-CONFIG_KXSD9=m
-CONFIG_LIS3L02DQ=m
-CONFIG_SCA3000=m
-
-#
-# Analog to digital convertors
-#
-CONFIG_MAX1363=m
-CONFIG_MAX1363_RING_BUFFER=y
-CONFIG_AD799X=m
-CONFIG_AD799X_RING_BUFFER=y
-CONFIG_AD7476=m
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_ADIS16260=m
-
-#
-# Inertial measurement units
-#
-CONFIG_ADIS16300=m
-CONFIG_ADIS16350=m
-CONFIG_ADIS16400=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_TSL2563=m
-CONFIG_SENSORS_ISL29018=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_AK8975=m
-CONFIG_SENSORS_HMC5843=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-CONFIG_IIO_GPIO_TRIGGER=m
-CONFIG_ZRAM=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_CRYSTALHD=m
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
-CONFIG_FB_XGI=m
-# CONFIG_LIRC_STAGING is not set
-# CONFIG_SOLO6X10 is not set
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-# CONFIG_ATH6K_LEGACY is not set
-# CONFIG_USB_ENESTORAGE is not set
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_LZO=y
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_EXOFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_DEPRECATED=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CEPH_FS=m
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-# CONFIG_9P_FS_POSIX_ACL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_LKDTM=m
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_RING_BUFFER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_OPTIMIZE_INLINING is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY_DMESG_RESTRICT=y
-# CONFIG_SECURITY is not set
-CONFIG_SECURITYFS=y
-CONFIG_INTEL_TXT=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_FPU=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_VHOST_NET=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig
index b0720a649c1..fe95ca28688 100644
--- a/srcpkgs/kernel/files/x86_64-dotconfig
+++ b/srcpkgs/kernel/files/x86_64-dotconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37 Kernel Configuration
-# Sun Jan 9 16:00:30 2011
+# Linux/x86_64 2.6.38.1 Kernel Configuration
+# Thu Mar 24 09:53:02 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -48,7 +48,6 @@ CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
@@ -71,10 +70,12 @@ CONFIG_LOCALVERSION=""
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -91,7 +92,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
# IRQ subsystem
#
CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
CONFIG_HAVE_SPARSE_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
@@ -119,10 +119,13 @@ CONFIG_CGROUPS=y
CONFIG_CGROUP_NS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
@@ -131,9 +134,11 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -141,10 +146,12 @@ CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
@@ -190,6 +197,7 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -299,6 +307,7 @@ CONFIG_GENERIC_CPU=y
CONFIG_X86_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=7
CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_XADD=y
CONFIG_X86_WP_WORKS_OK=y
@@ -347,7 +356,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DIRECT_GBPAGES=y
CONFIG_NUMA=y
-# CONFIG_K8_NUMA is not set
+CONFIG_AMD_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
CONFIG_NODES_SPAN_OTHER_NODES=y
# CONFIG_NUMA_EMU is not set
@@ -373,6 +382,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
@@ -383,7 +393,9 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
CONFIG_MTRR=y
CONFIG_MTRR_SANITIZER=y
@@ -422,7 +434,6 @@ CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATION=y
@@ -443,6 +454,7 @@ CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
@@ -511,7 +523,7 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_DMAR=y
# CONFIG_DMAR_DEFAULT_ON is not set
CONFIG_DMAR_FLOPPY_WA=y
@@ -984,7 +996,10 @@ CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_RPS=y
+CONFIG_XPS=y
#
# Network testing
@@ -999,6 +1014,7 @@ CONFIG_CAN_BCM=m
# CAN Device Drivers
#
CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
CONFIG_CAN_DEV=m
# CONFIG_CAN_CALC_BITTIMING is not set
CONFIG_CAN_MCP251X=m
@@ -1015,6 +1031,8 @@ CONFIG_CAN_SJA1000=m
#
CONFIG_CAN_EMS_USB=m
CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
# CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_IRDA=m
@@ -1494,6 +1512,7 @@ CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=m
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_SIL24=m
CONFIG_ATA_SFF=y
@@ -1592,6 +1611,7 @@ CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
@@ -1599,6 +1619,10 @@ CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1818,6 +1842,7 @@ CONFIG_ATH_COMMON=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
CONFIG_ATH9K_HW=m
CONFIG_ATH9K_COMMON=m
CONFIG_ATH9K=m
@@ -1836,6 +1861,7 @@ CONFIG_B43_PCICORE_AUTOSELECT=y
CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_LP=y
CONFIG_B43_LEDS=y
CONFIG_B43_HWRNG=y
@@ -1907,14 +1933,13 @@ CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
CONFIG_RT2500PCI=m
CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
@@ -1926,13 +1951,17 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTLWIFI=m
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
@@ -1957,6 +1986,7 @@ CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
@@ -2143,6 +2173,7 @@ CONFIG_JOYSTICK_ZHENHUA=m
CONFIG_JOYSTICK_DB9=m
CONFIG_JOYSTICK_GAMECON=m
CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
CONFIG_JOYSTICK_JOYDUMP=m
CONFIG_JOYSTICK_XPAD=m
CONFIG_JOYSTICK_XPAD_FF=y
@@ -2204,8 +2235,10 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_AD714X_SPI=m
@@ -2219,7 +2252,6 @@ CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
@@ -2227,6 +2259,8 @@ CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
#
# Hardware I/O ports
@@ -2304,8 +2338,10 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_IFX6X60=m
+CONFIG_SERIAL_PCH_UART=m
CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
@@ -2360,6 +2396,7 @@ CONFIG_I2C_MUX=m
#
# Multiplexer I2C Chip support
#
+CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_HELPER_AUTO=y
@@ -2405,6 +2442,7 @@ CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_SIMTEC=m
# CONFIG_I2C_XILINX is not set
+CONFIG_I2C_EG20T=m
#
# External I2C/SMBus adapter drivers
@@ -2431,11 +2469,12 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
CONFIG_SPI_GPIO=m
CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_PXA2XX_PCI is not set
CONFIG_SPI_TOPCLIFF_PCH=m
CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MID_DMA=y
#
# SPI Protocol Masters
@@ -2448,12 +2487,18 @@ CONFIG_SPI_TLE62X0=m
#
CONFIG_PPS=m
# CONFIG_PPS_DEBUG is not set
+CONFIG_NTP_PPS=y
#
# PPS clients support
#
CONFIG_PPS_CLIENT_KTIMER=m
CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
@@ -2482,6 +2527,7 @@ CONFIG_GPIO_ADP5588=m
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_LANGWELL=y
CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
CONFIG_GPIO_TIMBERDALE=y
CONFIG_GPIO_RDC321X=m
@@ -2518,6 +2564,7 @@ CONFIG_W1_MASTER_GPIO=m
#
CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
CONFIG_W1_SLAVE_DS2433_CRC=y
@@ -2532,8 +2579,10 @@ CONFIG_BATTERY_DS2782=m
CONFIG_BATTERY_BQ20Z75=m
CONFIG_BATTERY_BQ27x00=m
CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
CONFIG_CHARGER_PCF50633=m
CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
CONFIG_HWMON=m
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2561,6 +2610,7 @@ CONFIG_SENSORS_K8TEMP=m
CONFIG_SENSORS_K10TEMP=m
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
CONFIG_SENSORS_DS1621=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_F71805F=m
@@ -2601,6 +2651,7 @@ CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SIS5595=m
CONFIG_SENSORS_SMM665=m
CONFIG_SENSORS_DME1737=m
@@ -2653,6 +2704,7 @@ CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
CONFIG_GEODE_WDT=m
CONFIG_SC520_WDT=m
CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -2669,6 +2721,7 @@ CONFIG_HP_WATCHDOG=m
CONFIG_HPWDT_NMI_DECODING=y
CONFIG_SC1200_WDT=m
CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
CONFIG_60XX_WDT=m
CONFIG_SBC8360_WDT=m
CONFIG_CPU5_WDT=m
@@ -2711,7 +2764,7 @@ CONFIG_SSB_SDIOHOST=y
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
+CONFIG_MFD_CORE=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SM501_GPIO is not set
CONFIG_HTC_PASIC3=m
@@ -2728,11 +2781,15 @@ CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
CONFIG_ABX500_CORE=y
CONFIG_EZX_PCAP=y
+CONFIG_AB8500_CORE=y
+CONFIG_AB8500_DEBUG=y
+CONFIG_MFD_CS5535=m
CONFIG_MFD_TIMBERDALE=m
CONFIG_LPC_SCH=m
CONFIG_MFD_RDC321X=m
CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR_DUMMY is not set
@@ -2749,11 +2806,15 @@ CONFIG_REGULATOR_PCF50633=m
CONFIG_REGULATOR_LP3971=m
CONFIG_REGULATOR_LP3972=m
CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
CONFIG_REGULATOR_TPS65023=m
CONFIG_REGULATOR_TPS6507X=m
CONFIG_REGULATOR_ISL6271A=m
CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_TPS6524X=m
CONFIG_MEDIA_SUPPORT=m
#
@@ -2761,8 +2822,6 @@ CONFIG_MEDIA_SUPPORT=m
#
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_DVB_CORE=m
CONFIG_VIDEO_MEDIA=m
@@ -2771,8 +2830,7 @@ CONFIG_VIDEO_MEDIA=m
#
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
+CONFIG_RC_CORE=m
CONFIG_LIRC=m
CONFIG_RC_MAP=m
CONFIG_IR_NEC_DECODER=m
@@ -2787,6 +2845,8 @@ CONFIG_IR_IMON=m
CONFIG_IR_MCEUSB=m
CONFIG_IR_NUVOTON=m
CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
# CONFIG_MEDIA_ATTACH is not set
CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -2810,7 +2870,6 @@ CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_MEDIA_TUNER_TDA18218=m
CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
CONFIG_VIDEOBUF_VMALLOC=m
@@ -2836,7 +2895,6 @@ CONFIG_VIDEO_IR_I2C=m
CONFIG_VIDEO_TVAUDIO=m
CONFIG_VIDEO_TDA7432=m
CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
CONFIG_VIDEO_TEA6415C=m
CONFIG_VIDEO_TEA6420=m
CONFIG_VIDEO_MSP3400=m
@@ -2922,6 +2980,7 @@ CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
@@ -2948,6 +3007,7 @@ CONFIG_SOC_CAMERA_MT9V022=m
CONFIG_SOC_CAMERA_RJ54N1=m
CONFIG_SOC_CAMERA_TW9910=m
CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
CONFIG_SOC_CAMERA_OV6650=m
CONFIG_SOC_CAMERA_OV772X=m
CONFIG_SOC_CAMERA_OV9640=m
@@ -3005,15 +3065,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
CONFIG_USB_SN9C102=m
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
@@ -3024,7 +3080,6 @@ CONFIG_USB_S2255=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_TESTDEV=m
CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_I2C_SI4713=m
@@ -3038,6 +3093,7 @@ CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
CONFIG_DVB_MAX_ADAPTERS=8
# CONFIG_DVB_DYNAMIC_MINORS is not set
CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3223,7 +3279,9 @@ CONFIG_DVB_S5H1411=m
#
# ISDB-T (terrestrial) frontends
#
+CONFIG_DVB_S921=m
CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
#
# Digital terrestrial only tuners/PLL
@@ -3248,8 +3306,6 @@ CONFIG_DVB_IX2505V=m
# Tools to develop new frontends
#
# CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
#
# Graphics support
@@ -3291,6 +3347,7 @@ CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
CONFIG_FB_DEFERRED_IO=y
CONFIG_FB_SVGALIB=m
# CONFIG_FB_MACMODES is not set
@@ -3362,6 +3419,7 @@ CONFIG_FB_TRIDENT=m
CONFIG_FB_TMIO=m
CONFIG_FB_TMIO_ACCELL=y
CONFIG_FB_SM501=m
+CONFIG_FB_UDL=m
# CONFIG_FB_VIRTUAL is not set
CONFIG_XEN_FBDEV_FRONTEND=m
CONFIG_FB_METRONOME=m
@@ -3539,7 +3597,6 @@ CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m
@@ -3574,6 +3631,7 @@ CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
CONFIG_SND_SOC=m
+CONFIG_SND_SOC_CACHE_LZO=y
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SOUND_PRIME is not set
@@ -3594,6 +3652,7 @@ CONFIG_USB_HIDDEV=y
#
CONFIG_HID_3M_PCT=m
CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=m
CONFIG_HID_APPLE=m
CONFIG_HID_BELKIN=m
@@ -3604,6 +3663,7 @@ CONFIG_HID_PRODIKEYS=m
CONFIG_HID_CYPRESS=m
CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
CONFIG_HID_EGALAX=m
CONFIG_HID_ELECOM=m
CONFIG_HID_EZKEY=m
@@ -3622,6 +3682,7 @@ CONFIG_HID_MAGICMOUSE=m
CONFIG_HID_MICROSOFT=m
CONFIG_HID_MOSART=m
CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
CONFIG_HID_NTRIG=m
CONFIG_HID_ORTEK=m
CONFIG_HID_PANTHERLORD=m
@@ -3635,6 +3696,7 @@ CONFIG_HID_PICOLCD_LEDS=y
CONFIG_HID_QUANTA=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
CONFIG_HID_ROCCAT_PYRA=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
@@ -3843,13 +3905,15 @@ CONFIG_USB_GADGET=m
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
CONFIG_USB_GADGET_NET2280=y
CONFIG_USB_NET2280=m
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
@@ -3857,6 +3921,7 @@ CONFIG_USB_AUDIO=m
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_FUNCTIONFS=m
# CONFIG_USB_FUNCTIONFS_ETH is not set
@@ -3885,6 +3950,7 @@ CONFIG_USB_G_WEBCAM=m
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_NOP_USB_XCEIV=m
+CONFIG_AB8500_USB=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -3892,6 +3958,7 @@ CONFIG_UWB_I1480U=m
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_CLKGATE=y
#
# MMC/SD/SDIO Card Drivers
@@ -3967,6 +4034,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
+CONFIG_NFC_DEVICES=y
+CONFIG_PN544_NFC=m
# CONFIG_ACCESSIBILITY is not set
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_USER_MAD=m
@@ -4022,7 +4091,7 @@ CONFIG_RTC_CLASS=m
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
CONFIG_RTC_DRV_TEST=m
#
@@ -4076,6 +4145,7 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
@@ -4122,9 +4192,12 @@ CONFIG_UIO_NETX=m
CONFIG_XEN_BALLOON=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
CONFIG_XENFS=m
CONFIG_XEN_COMPAT_XENFS=y
CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=m
+CONFIG_XEN_GNTDEV=m
CONFIG_XEN_PLATFORM_PCI=m
CONFIG_SWIOTLB_XEN=y
CONFIG_STAGING=y
@@ -4135,9 +4208,10 @@ CONFIG_SLICOSS=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_SE401=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
@@ -4264,7 +4338,6 @@ CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_USB_SERIAL_QUATECH_USB2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
-CONFIG_FB_UDL=m
CONFIG_HYPERV=m
CONFIG_HYPERV_STORAGE=m
CONFIG_HYPERV_BLOCK=m
@@ -4287,6 +4360,7 @@ CONFIG_VME_USER=m
# VME Board Drivers
#
CONFIG_VMIVME_7805=m
+CONFIG_DX_SEP=m
CONFIG_IIO=m
CONFIG_IIO_RING_BUFFER=y
CONFIG_IIO_SW_RING=m
@@ -4295,6 +4369,9 @@ CONFIG_IIO_TRIGGER=y
#
# Accelerometers
#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16203=m
+CONFIG_ADIS16204=m
CONFIG_ADIS16209=m
CONFIG_ADIS16220=m
CONFIG_ADIS16240=m
@@ -4307,14 +4384,53 @@ CONFIG_SCA3000=m
#
CONFIG_MAX1363=m
CONFIG_MAX1363_RING_BUFFER=y
+CONFIG_AD7150=m
+CONFIG_AD7152=m
+CONFIG_AD7291=m
+CONFIG_AD7298=m
+CONFIG_AD7314=m
CONFIG_AD799X=m
CONFIG_AD799X_RING_BUFFER=y
CONFIG_AD7476=m
+CONFIG_AD7887=m
+CONFIG_AD7745=m
+CONFIG_AD7816=m
+CONFIG_ADT75=m
+CONFIG_ADT7310=m
+CONFIG_ADT7410=m
+
+#
+# Analog digital bi-direction convertors
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+
+#
+# Digital to analog convertors
+#
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5446=m
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD5930=m
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+CONFIG_AD9850=m
+CONFIG_AD9852=m
+CONFIG_AD9910=m
+CONFIG_AD9951=m
#
# Digital gyroscope sensors
#
+CONFIG_ADIS16060=m
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
CONFIG_ADIS16260=m
+CONFIG_ADIS16251=m
#
# Inertial measurement units
@@ -4335,6 +4451,27 @@ CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_AK8975=m
CONFIG_SENSORS_HMC5843=m
+#
+# Active energy metering IC
+#
+CONFIG_ADE7753=m
+CONFIG_ADE7754=m
+CONFIG_ADE7758=m
+CONFIG_ADE7759=m
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S120X=m
+CONFIG_AD2S1210=m
+# CONFIG_AD2S1210_GPIO_INPUT is not set
+# CONFIG_AD2S1210_GPIO_OUTPUT is not set
+CONFIG_AD2S1210_GPIO_NONE=y
+
#
# Triggers - standalone
#
@@ -4343,8 +4480,6 @@ CONFIG_IIO_GPIO_TRIGGER=m
CONFIG_ZRAM=m
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_SAMSUNG_LAPTOP=m
CONFIG_FB_SM7XX=m
CONFIG_VIDEO_DT3155=m
@@ -4355,9 +4490,9 @@ CONFIG_CRYSTALHD=m
# Texas Instruments shared transport line discipline
#
CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
CONFIG_FB_XGI=m
# CONFIG_LIRC_STAGING is not set
+CONFIG_EASYCAP=m
# CONFIG_SOLO6X10 is not set
CONFIG_ACPI_QUICKSTART=m
CONFIG_MACH_NO_WESTBRIDGE=y
@@ -4386,6 +4521,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -4469,7 +4606,6 @@ CONFIG_JFS_POSIX_ACL=y
CONFIG_JFS_SECURITY=y
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
-CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
@@ -4486,6 +4622,7 @@ CONFIG_OCFS2_FS_STATS=y
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=m
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
@@ -4524,6 +4661,8 @@ CONFIG_CACHEFILES=m
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
@@ -4567,6 +4706,7 @@ CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
@@ -4746,6 +4886,7 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
CONFIG_IO_DELAY_TYPE_0X80=0
@@ -4763,6 +4904,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
CONFIG_SECURITY_DMESG_RESTRICT=y
# CONFIG_SECURITY is not set
@@ -4887,6 +5030,9 @@ CONFIG_CRYPTO_LZO=m
# Random Number Generation
#
CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -4898,6 +5044,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -4928,9 +5075,19 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y
@@ -4944,3 +5101,4 @@ CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/srcpkgs/kernel/patches/series b/srcpkgs/kernel/patches/series
new file mode 100644
index 00000000000..54ef3cb6983
--- /dev/null
+++ b/srcpkgs/kernel/patches/series
@@ -0,0 +1,2 @@
+unionfs-2.5.8_for_2.6.38-rc7.diff.gz
+unionfs-2.5.8-setattr-fixes.patch
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz
deleted file mode 100644
index 936bff55ed2..00000000000
Binary files a/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz and /dev/null differ
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz.args b/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz.args
deleted file mode 100644
index 2eba1cb3c5c..00000000000
--- a/srcpkgs/kernel/patches/unionfs-2.5.7_for_2.6.37-rc1.diff.gz.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch b/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch
new file mode 100644
index 00000000000..af7ff5eb5a2
--- /dev/null
+++ b/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch
@@ -0,0 +1,25 @@
+Adapted for 2.6.38 from http://www.fsl.cs.sunysb.edu/pipermail/unionfs/2011-March/006088.html
+
+--- fs/unionfs/inode.c.orig 2011-03-29 09:19:23.477166008 +0200
++++ fs/unionfs/inode.c 2011-03-29 09:22:02.267303281 +0200
+@@ -936,7 +936,8 @@ static int unionfs_setattr(struct dentry
+ err = -EINVAL;
+ goto out;
+ }
+- lower_inode = unionfs_lower_inode(inode);
++ lower_inode = lower_dentry->d_inode;
++ BUG_ON(!lower_inode);
+
+ /* check if user has permission to change lower inode */
+ err = inode_change_ok(lower_inode, ia);
+@@ -970,7 +971,9 @@ static int unionfs_setattr(struct dentry
+ goto out;
+ /* get updated lower_dentry/inode after copyup */
+ lower_dentry = unionfs_lower_dentry(dentry);
+- lower_inode = unionfs_lower_inode(inode);
++ BUG_ON(!lower_inode);
++ lower_inode = lower_dentry->d_inode;
++ BUG_ON(!lower_inode);
+ }
+
+ /*
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz
new file mode 100644
index 00000000000..3c0df79c072
Binary files /dev/null and b/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz differ
diff --git a/srcpkgs/NetworkManager/patches/create_dirs.patch.args b/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz.args
similarity index 100%
rename from srcpkgs/NetworkManager/patches/create_dirs.patch.args
rename to srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz.args
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index d292e34d5a2..3bea7126343 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -11,7 +11,7 @@ triggers="initramfs-tools"
nostrip=yes
noverifyrdeps=yes
preserve=yes
-#revision=1
+revision=1
_kernel_headers_revision=${revision}
if [ -n "${revision}" ]; then
_kernver="${version}_${revision}"
diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index 3698a067a09..0d0226763bf 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -26,7 +26,7 @@ do_install()
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/{doc,man} ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share
mv ${SRCPKGDESTDIR}/usr/lib/X11/locale/common/*.a \
${DESTDIR}/usr/lib/X11/locale/common
}
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 26ec7780767..3415025624d 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,13 +1,13 @@
# Template build file for 'libX11'.
pkgname=libX11
-version=1.4.1
+version=1.4.3
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
--enable-secure-rpc --enable-loadable-i18n"
short_desc="Base X libraries from modular Xorg X11"
maintainer="Juan RP "
-checksum=70f4e0f798645a0f269f362bfdbd4c7934dae3a2dd9ecbad28d6ede414f63ce2
+checksum=38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a
long_desc="
This is the libX11 library that is the C binding to the X protocol. It
is the foundation of practically every X Window System program out there.
diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 4f2ddf84bae..d8d7b931b11 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -1,11 +1,11 @@
# Template build file for 'libXt'.
pkgname=libXt
-version=1.0.9
+version=1.1.1
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="X Toolkit Intrinsics library"
maintainer="Juan RP "
-checksum=eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01
+checksum=a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
long_desc="
This is the X Toolkit Intrinsics library. Xt Intrinsics is a library
of C routines (based on Xlib) used for designing user interfaces with
diff --git a/srcpkgs/libavcodec b/srcpkgs/libavcodec
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavcodec
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libavdevice b/srcpkgs/libavdevice
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavdevice
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libavformat b/srcpkgs/libavformat
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavformat
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libavutil b/srcpkgs/libavutil
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavutil
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libbonobo-devel b/srcpkgs/libbonobo-devel
deleted file mode 120000
index e48a8714952..00000000000
--- a/srcpkgs/libbonobo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libbonobo
\ No newline at end of file
diff --git a/srcpkgs/libbonobo/files/bonobo-activation-config.xml b/srcpkgs/libbonobo/files/bonobo-activation-config.xml
deleted file mode 100644
index 2d046b1af10..00000000000
--- a/srcpkgs/libbonobo/files/bonobo-activation-config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- - /usr/lib/bonobo/servers
-
-
-
-
-
-
-
-
diff --git a/srcpkgs/libbonobo/libbonobo-devel.template b/srcpkgs/libbonobo/libbonobo-devel.template
deleted file mode 100644
index 79487ef506d..00000000000
--- a/srcpkgs/libbonobo/libbonobo-devel.template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'libbonobo-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
-Add_dependency run flex
-Add_dependency run ORBit2-devel
-Add_dependency run glib-devel
-Add_dependency run libxml2-devel
-Add_dependency run libbonobo
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,idl} ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/libbonobo/template b/srcpkgs/libbonobo/template
deleted file mode 100644
index f8c714c7295..00000000000
--- a/srcpkgs/libbonobo/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'libbonobo'
-pkgname=libbonobo
-version=2.32.0
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-static --localstatedir=/var"
-short_desc="GNOME Object activation framework library"
-maintainer="Juan RP "
-checksum=b8b8037d5e8e37f39395a2a2fba7f2fb3d5b53ecedc3d419181912b831ab1349
-long_desc="
- Bonobo is a set of language and system independent CORBA interfaces
- for creating reusable components, controls and creating compound
- documents.
-
- We distinguish between 'Bonobo' the name of the component architecture,
- and 'bonobo' which is the C-based easy to use implementation of the
- Bonobo component architecture.
-
- libbonobo contains a rich API for dealing Bonobo Objects (activation
- for example)."
-
-conf_files="/etc/bonobo-activation/bonobo-activation-config.xml"
-subpackages="$pkgname-devel"
-
-Add_dependency run glibc
-Add_dependency run ORBit2
-Add_dependency run glib
-Add_dependency run libxml2
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build flex
-Add_dependency build ORBit2-devel
-Add_dependency build glib-devel
-Add_dependency build libxml2-devel
-
-post_install()
-{
- rm -f ${DESTDIR}/etc/${conf_files}
- install -m644 ${FILESDIR}/*.xml ${DESTDIR}/etc/bonobo-activation
-}
diff --git a/srcpkgs/libbonoboui-devel b/srcpkgs/libbonoboui-devel
deleted file mode 120000
index dc609d34883..00000000000
--- a/srcpkgs/libbonoboui-devel
+++ /dev/null
@@ -1 +0,0 @@
-libbonoboui
\ No newline at end of file
diff --git a/srcpkgs/libbonoboui/libbonoboui-devel.template b/srcpkgs/libbonoboui/libbonoboui-devel.template
deleted file mode 100644
index 765b0ddd9e3..00000000000
--- a/srcpkgs/libbonoboui/libbonoboui-devel.template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'libbonoboui-devel'.
-#
-short_desc="${sourcepkg} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-revision=1
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libart-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build GConf-devel
-Add_dependency build libglade-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxml2-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 libbonoboui
-
-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
-}
diff --git a/srcpkgs/libbonoboui/template b/srcpkgs/libbonoboui/template
deleted file mode 100644
index b3ad07758e9..00000000000
--- a/srcpkgs/libbonoboui/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'libbonoboui'
-pkgname=libbonoboui
-version=2.24.3
-revision=2
-distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-static --localstatedir=/var"
-short_desc="User Interface library for Bonobo"
-maintainer="Juan RP "
-checksum=0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84
-long_desc="
- Bonobo is a set of language and system independent CORBA interfaces
- for creating reusable components, controls and creating compound
- documents.
-
- We distinguish between 'Bonobo' the name of the component architecture,
- and 'bonobo' which is the C-based easy to use implementation of the
- Bonobo component architecture.
-
- libbonoboui contains a rich API for dealing graphical Bonobo Objects."
-
-subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run libX11
-Add_dependency run libgnomecanvas
-Add_dependency run libart
-Add_dependency run libgnome
-Add_dependency run popt
-Add_dependency run libbonobo
-Add_dependency run ORBit2
-Add_dependency run GConf
-Add_dependency run libglade
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run libxml2
-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 build pkg-config
-Add_dependency build intltool
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libX11-devel
-Add_dependency build libgnomecanvas-devel
-Add_dependency build libart-devel
-Add_dependency build libgnome-devel
-Add_dependency build popt-devel
-Add_dependency build libbonobo-devel
-Add_dependency build ORBit2-devel
-Add_dependency build GConf-devel
-Add_dependency build libglade-devel
-Add_dependency build gtk+-devel
-Add_dependency build libxml2-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
-
diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template
index 75f31d02d30..815f97fbe9d 100644
--- a/srcpkgs/libcanberra/template
+++ b/srcpkgs/libcanberra/template
@@ -1,9 +1,10 @@
# Template build file for 'libcanberra'.
pkgname=libcanberra
version=0.28
+revision=1
distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu_configure
-configure_args="--localstatedir=/var --enable-alsa --enable-null --disable-gtk3
+configure_args="--localstatedir=/var --enable-alsa --enable-null
--enable-gstreamer --disable-oss --with-builtin=dso --disable-lynx
--disable-schemas-install --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
short_desc="XDG Sound Theme and Name Specification library implementation"
@@ -35,6 +36,7 @@ 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 libvorbis
Add_dependency run libogg
Add_dependency run libltdl
@@ -52,6 +54,7 @@ Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build libvorbis-devel
Add_dependency build libogg-devel
Add_dependency build libltdl-devel
diff --git a/srcpkgs/libchamplain-devel b/srcpkgs/libchamplain-devel
new file mode 120000
index 00000000000..9b3721653ba
--- /dev/null
+++ b/srcpkgs/libchamplain-devel
@@ -0,0 +1 @@
+libchamplain
\ No newline at end of file
diff --git a/srcpkgs/libchamplain/depends b/srcpkgs/libchamplain/depends
new file mode 100644
index 00000000000..31a1d27c331
--- /dev/null
+++ b/srcpkgs/libchamplain/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.10.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libchamplain/libchamplain-devel.template b/srcpkgs/libchamplain/libchamplain-devel.template
new file mode 100644
index 00000000000..b447c6b63ee
--- /dev/null
+++ b/srcpkgs/libchamplain/libchamplain-devel.template
@@ -0,0 +1,42 @@
+# Template file for 'libchamplain-devel'.
+#
+short_desc="${short_desc} - 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 vala-devel
+Add_dependency run gobject-introspection
+Add_dependency run libsoup-gnome-devel
+Add_dependency run libsoup-devel
+Add_dependency run gtk+3-devel
+Add_dependency run clutter-devel
+Add_dependency run clutter-gtk-devel
+Add_dependency run cairo-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run json-glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-devel
+Add_dependency run MesaLib-devel
+Add_dependency run libdrm-devel
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXcomposite-devel
+Add_dependency run libXi-devel
+Add_dependency run libXfixes-devel
+Add_dependency run glib-devel
+Add_dependency run sqlite-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template
new file mode 100644
index 00000000000..a1b4f7585e8
--- /dev/null
+++ b/srcpkgs/libchamplain/template
@@ -0,0 +1,66 @@
+# Template file for 'libchamplain'
+pkgname=libchamplain
+version=0.10.0
+distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--enable-vala"
+short_desc="Library aimed to provide a Clutter widget to display rasterized maps"
+maintainer="Juan RP "
+checksum=98700bb3f3ada5f9bd6b938486e55f90ea76ce4108a8b62928cf185ded49dbb1
+long_desc="
+ libchamplain is a Clutter based widget to display rich, eye-candy and
+ interactive maps."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libsoup-gnome
+Add_dependency run libsoup
+Add_dependency run gtk+3
+Add_dependency run clutter
+Add_dependency run clutter-gtk
+Add_dependency run cairo
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run json-glib
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+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 glib
+Add_dependency run sqlite
+Add_dependency run freetype
+Add_dependency run fontconfig
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build vala-devel
+Add_dependency build gobject-introspection
+Add_dependency build libsoup-gnome-devel
+Add_dependency build libsoup-devel
+Add_dependency build gtk+3-devel
+Add_dependency build clutter-devel
+Add_dependency build clutter-gtk-devel
+Add_dependency build cairo-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build json-glib-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build libpng-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 glib-devel
+Add_dependency build sqlite-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 6218087a416..f51e49aab74 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,13 +1,13 @@
# Template build file for 'libdrm'.
pkgname=libdrm
-version=2.4.23
+version=2.4.24
distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-udev --enable-vmwgfx-experimental-api
--enable-nouveau-experimental-api"
short_desc="Userspace interface to kernel DRM services"
maintainer="Juan RP "
-checksum=c0f06d68c3edba7a1ad937f5481a8c287efd4cd368cee66cd9e678b06a911c18
+checksum=c7012381f64458af9f291d913309448aac7dd23a28dc86c6970e4bf38effb6a5
long_desc="
This package provides a library which offers a userspace interface
to kernel DRM (Direct Rendering Manager) services for access to
@@ -23,5 +23,6 @@ Add_dependency build libudev-devel
pre_configure()
{
+ sed -i -e "s|cairo.h|cairo/cairo.h|" tests/modetest/modetest.c
cd ${wrksrc} && libtoolize -f && aclocal && autoconf && automake
}
diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template
index eb919bb6327..cc69a1f48f2 100644
--- a/srcpkgs/libgcrypt/libgcrypt-devel.template
+++ b/srcpkgs/libgcrypt/libgcrypt-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 glibc
Add_dependency run libgpg-error-devel
Add_dependency run libgcrypt
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 39ae564ea14..9c4f680ebf0 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,11 +1,11 @@
# Template build file for 'libgcrypt'.
pkgname=libgcrypt
-version=1.4.5
+version=1.4.6
distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="GNU cryptographic library"
maintainer="Juan RP "
-checksum=496f907c5324de75367ec61c63bfeed1309ef0bc64845dc20b3597731abd9e40
+checksum=3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
long_desc="
This is a general purpose cryptographic library based on the code from GnuPG.
It provides functions for all cryptograhic building blocks: symmetric ciphers
diff --git a/srcpkgs/libgdata/depends b/srcpkgs/libgdata/depends
index ddc0dfeefa5..f5d798e2943 100644
--- a/srcpkgs/libgdata/depends
+++ b/srcpkgs/libgdata/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.6.5"
+abi_depends=">=0.8.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libgdata/gir-gdata.template b/srcpkgs/libgdata/gir-gdata.template
deleted file mode 100644
index 0fbe8960aff..00000000000
--- a/srcpkgs/libgdata/gir-gdata.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-gdata'.
-#
-short_desc="Introspection data for libgdata"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the libgdata
- library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 6872d830fbc..256d41b3c94 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,17 +1,17 @@
# Template file for 'libgdata'
pkgname=libgdata
-version=0.6.6
-distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.bz2"
+version=0.8.0
+distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Library for accessing GData webservices"
maintainer="Juan RP "
-checksum=cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5
+checksum=1a816dda7de8ce162e00cc1c782a5ae25230a36d56c590a67d86848058797c9f
long_desc="
libgdata is a GLib-based library for accessing online service APIs using the
GData protocol — most notably, Google's services. It provides APIs to access
the common Google services, and has full asynchronous support."
-subpackages="gir-gdata $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
diff --git a/srcpkgs/libgee-devel b/srcpkgs/libgee-devel
new file mode 120000
index 00000000000..30193f8878e
--- /dev/null
+++ b/srcpkgs/libgee-devel
@@ -0,0 +1 @@
+libgee
\ No newline at end of file
diff --git a/srcpkgs/libgee/depends b/srcpkgs/libgee/depends
new file mode 100644
index 00000000000..017786f6fa3
--- /dev/null
+++ b/srcpkgs/libgee/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.6.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libgee/libgee-devel.template b/srcpkgs/libgee/libgee-devel.template
new file mode 100644
index 00000000000..e55435d4cd6
--- /dev/null
+++ b/srcpkgs/libgee/libgee-devel.template
@@ -0,0 +1,16 @@
+# Template file for 'libgee-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glib-devel
+Add_dependency run libgee
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libgee/template b/srcpkgs/libgee/template
new file mode 100644
index 00000000000..7c6a3e2e103
--- /dev/null
+++ b/srcpkgs/libgee/template
@@ -0,0 +1,19 @@
+# Template file for 'libgee'
+pkgname=libgee
+version=0.6.1
+distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="GObject collection library"
+maintainer="Juan RP "
+checksum=e6220f321b53f7732e0b45db7b8f29088cf4892e798b9b9a02bed16938030121
+long_desc="
+ Libgee is a collection library providing GObject-based interfaces and classes
+ for commonly used data structures."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build vala-devel
diff --git a/srcpkgs/libgnome-devel b/srcpkgs/libgnome-devel
deleted file mode 120000
index 84b3ed0bcab..00000000000
--- a/srcpkgs/libgnome-devel
+++ /dev/null
@@ -1 +0,0 @@
-libgnome
\ No newline at end of file
diff --git a/srcpkgs/libgnome-keyring/depends b/srcpkgs/libgnome-keyring/depends
index 071d27b792a..ab0d9627ad7 100644
--- a/srcpkgs/libgnome-keyring/depends
+++ b/srcpkgs/libgnome-keyring/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=3.0.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index a85d74fbd36..58265b7a0c1 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,13 +1,12 @@
# Template file for 'libgnome-keyring'
pkgname=libgnome-keyring
-version=2.32.0
-revision=1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="GNOME keyring client library"
maintainer="Juan RP "
-checksum=56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
+checksum=165e653d93e6ab74ea0a32e6fbbcd2b38a18aeadccf6f7082a0fa3d21bf1ce01
long_desc="
libgnome-keyring is a program that keeps passwords and other secrets for
users. It is run as a damon in the session, similar to ssh-agent, and
diff --git a/srcpkgs/libgnome/depends b/srcpkgs/libgnome/depends
deleted file mode 100644
index 071d27b792a..00000000000
--- a/srcpkgs/libgnome/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-abi_depends=">=2.30.0"
-api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnome/libgnome-devel.template b/srcpkgs/libgnome/libgnome-devel.template
deleted file mode 100644
index 0aedd15ed03..00000000000
--- a/srcpkgs/libgnome/libgnome-devel.template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'libgnome-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 popt-devel
-Add_dependency run glib-devel
-Add_dependency run ORBit2-devel
-Add_dependency run GConf-devel
-Add_dependency run libbonobo-devel
-Add_dependency run gnome-vfs-devel
-Add_dependency run libgnome
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib/bonobo/monikers ${DESTDIR}/usr/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/gtk-doc ${DESTDIR}/usr/share
- mv ${SRCPKGDESTDIR}/usr/lib/bonobo/monikers/*.a \
- ${DESTDIR}/usr/lib/bonobo/monikers
-}
diff --git a/srcpkgs/libgnome/template b/srcpkgs/libgnome/template
deleted file mode 100644
index fc7f6ee371f..00000000000
--- a/srcpkgs/libgnome/template
+++ /dev/null
@@ -1,55 +0,0 @@
-# Template file for 'libgnome'
-pkgname=libgnome
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-esd
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
-short_desc="GNOME common librares"
-maintainer="Juan RP "
-checksum=b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4
-long_desc="
- This packages common libraries for the GNOME desktop."
-
-gconf_schemas="
-desktop_gnome_accessibility_keyboard.schemas
-desktop_gnome_accessibility_startup.schemas
-desktop_gnome_applications_at_mobility.schemas
-desktop_gnome_applications_at_visual.schemas
-desktop_gnome_applications_browser.schemas
-desktop_gnome_applications_office.schemas
-desktop_gnome_applications_terminal.schemas
-desktop_gnome_applications_window_manager.schemas
-desktop_gnome_background.schemas
-desktop_gnome_file_views.schemas
-desktop_gnome_interface.schemas
-desktop_gnome_lockdown.schemas
-desktop_gnome_peripherals_keyboard.schemas
-desktop_gnome_peripherals_mouse.schemas
-desktop_gnome_sound.schemas
-desktop_gnome_thumbnail_cache.schemas
-desktop_gnome_thumbnailers.schemas
-desktop_gnome_typing_break.schemas"
-
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
-
-Add_dependency run glibc
-Add_dependency run popt
-Add_dependency run glib
-Add_dependency run ORBit2
-Add_dependency run GConf
-Add_dependency run libbonobo
-Add_dependency run gnome-vfs
-Add_dependency run libcanberra
-
-Add_dependency build pkg-config
-Add_dependency build intltool
-Add_dependency build popt-devel
-Add_dependency build glib-devel
-Add_dependency build ORBit2-devel
-Add_dependency build GConf-devel
-Add_dependency build libbonobo-devel
-Add_dependency build gnome-vfs-devel
-Add_dependency build libcanberra-devel
diff --git a/srcpkgs/libgnomekbd/depends b/srcpkgs/libgnomekbd/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/libgnomekbd/depends
+++ b/srcpkgs/libgnomekbd/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnomekbd/libgnomekbd-devel.template b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
index 701eb5a8d1a..6c51fb468ad 100644
--- a/srcpkgs/libgnomekbd/libgnomekbd-devel.template
+++ b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
@@ -10,21 +10,22 @@ Add_dependency run intltool
Add_dependency run glib-devel
Add_dependency run libxml2-devel
Add_dependency run atk-devel
-Add_dependency run pango-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
-Add_dependency run cairo-devel
+Add_dependency run pango-devel
Add_dependency run gdk-pixbuf-devel
Add_dependency run libpng-devel
-Add_dependency run gtk+-devel
+Add_dependency run cairo-devel
Add_dependency run libX11-devel
+Add_dependency run gtk+3-devel
Add_dependency run libxklavier-devel
-Add_dependency run GConf-devel
+Add_dependency run libgnomekbd
do_install()
{
- mkdir -p ${DESTDIR}/usr/lib
+ 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
}
diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template
index 1a47873469c..b7f250293ce 100644
--- a/srcpkgs/libgnomekbd/template
+++ b/srcpkgs/libgnomekbd/template
@@ -1,50 +1,45 @@
# Template file for 'libgnomekbd'
pkgname=libgnomekbd
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0.1
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
+configure_args="--localstatedir=/var"
short_desc="Gnome keyboard configuration library"
maintainer="Juan RP "
-checksum=ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
+checksum=727293963847761b7942d9c5c195c317a5f5f18585ebc6d348147924242902e9
long_desc="
This packages a keyboard configuration library for the GNOME desktop."
-
-gconf_schemas="desktop_gnome_peripherals_keyboard_xkb.schemas"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+triggers="gsettings-schemas"
subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
Add_dependency run libxml2
Add_dependency run atk
-Add_dependency run pango
Add_dependency run freetype
Add_dependency run fontconfig
-Add_dependency run cairo
+Add_dependency run pango
Add_dependency run gdk-pixbuf
Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run cairo
Add_dependency run libX11
+Add_dependency run gtk+3
Add_dependency run libxklavier
-Add_dependency run GConf
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build glib-devel
Add_dependency build libxml2-devel
Add_dependency build atk-devel
-Add_dependency build pango-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build cairo-devel
+Add_dependency build pango-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
+Add_dependency build cairo-devel
Add_dependency build libX11-devel
+Add_dependency build gtk+3-devel
Add_dependency build libxklavier-devel
-Add_dependency build GConf-devel
-Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/libgsf/libgsf-devel.template b/srcpkgs/libgsf/libgsf-devel.template
index 0d99b55d3c6..73a6cdee57d 100644
--- a/srcpkgs/libgsf/libgsf-devel.template
+++ b/srcpkgs/libgsf/libgsf-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
-revision=2
-
Add_dependency run pkg-config
Add_dependency run glib-devel
Add_dependency run libxml2-devel
diff --git a/srcpkgs/libgsf/libgsf-python.template b/srcpkgs/libgsf/libgsf-python.template
index 229c9d6af02..d55355066c6 100644
--- a/srcpkgs/libgsf/libgsf-python.template
+++ b/srcpkgs/libgsf/libgsf-python.template
@@ -5,9 +5,9 @@ long_desc="${long_desc}
This package contains the Python bindings."
-revision=1
-
Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency run bzip2
Add_dependency run glib
Add_dependency run libxml2
Add_dependency run python
diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index f274c581c64..d0bda50db79 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -1,14 +1,13 @@
# Template build file for 'libgsf'.
pkgname=libgsf
-version=1.14.11
-revision=2
+version=1.14.20
distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --disable-schemas-install
--without-gnome-vfs --without-bonobo"
short_desc="Library for layout and rendering of text"
maintainer="Juan RP "
-checksum=ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf
+checksum=df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6
long_desc="
libgsf provides an efficient extensible I/O abstraction for dealing with
different structured file formats. It has support for Microsoft OLE2
@@ -16,11 +15,13 @@ long_desc="
# XXX: investigate gnome stuff.
subpackages="$pkgname-python $pkgname-devel"
-Add_dependency run glib
-Add_dependency run libxml2
Add_dependency run glibc
Add_dependency run zlib
Add_dependency run bzip2
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run gdk-pixbuf
+
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build python
@@ -29,9 +30,5 @@ Add_dependency build libxml2-devel
Add_dependency build glibc-devel
Add_dependency build zlib-devel
Add_dependency build bzip2-devel
+Add_dependency build gdk-pixbuf-devel
Add_dependency build pygtk-devel
-
-post_install()
-{
- rm -f ${DESTDIR}/usr/share/man/man1/gsf-office*
-}
diff --git a/srcpkgs/libgtop/libgtop-devel.template b/srcpkgs/libgtop/libgtop-devel.template
index 640156d8bc3..14833958f71 100644
--- a/srcpkgs/libgtop/libgtop-devel.template
+++ b/srcpkgs/libgtop/libgtop-devel.template
@@ -17,5 +17,5 @@ do_install()
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/{gtk-doc,info} ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc,info} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template
index 8f9d5112ba6..8cc03fe6811 100644
--- a/srcpkgs/libgtop/template
+++ b/srcpkgs/libgtop/template
@@ -1,12 +1,12 @@
# Template build file for 'libgtop'.
pkgname=libgtop
-version=2.28.2
+version=2.28.3
distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var -with-libgtop-smp"
short_desc="Library to retrieve system information, used in GNOME"
maintainer="Juan RP "
-checksum=49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d
+checksum=2c866bd14b3cd78f78504cfb65baa105d62b8085c90e433ab9db97e050efea42
long_desc="
libgtop is a library that fetches system information about the running
system such as cpu and memory usage, active processes etc. It
@@ -18,7 +18,9 @@ subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
Add_dependency run libXau
+
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build glib-devel
Add_dependency build libXau-devel
+Add_dependency build gobject-introspection
diff --git a/srcpkgs/libgweather-python b/srcpkgs/libgweather-python
deleted file mode 120000
index 33c4dea4aeb..00000000000
--- a/srcpkgs/libgweather-python
+++ /dev/null
@@ -1 +0,0 @@
-libgweather
\ No newline at end of file
diff --git a/srcpkgs/libgweather/depends b/srcpkgs/libgweather/depends
index 071d27b792a..0edbddbd1a9 100644
--- a/srcpkgs/libgweather/depends
+++ b/srcpkgs/libgweather/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.6"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libgweather/libgweather-devel.template b/srcpkgs/libgweather/libgweather-devel.template
index 990f90a28b4..f10df507cca 100644
--- a/srcpkgs/libgweather/libgweather-devel.template
+++ b/srcpkgs/libgweather/libgweather-devel.template
@@ -1,24 +1,23 @@
# Template file for 'libgweather-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."
Add_dependency run pkg-config
Add_dependency run intltool
-Add_dependency run python-devel
Add_dependency run glib-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 gtk+-devel
+Add_dependency run gtk+3-devel
Add_dependency run libxml2-devel
-Add_dependency run GConf-devel
Add_dependency run libsoup-devel
Add_dependency run libsoup-gnome-devel
+Add_dependency run GConf-devel
Add_dependency run libgweather
do_install()
@@ -27,5 +26,5 @@ do_install()
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/gtk-doc ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/libgweather/libgweather-python.template b/srcpkgs/libgweather/libgweather-python.template
deleted file mode 100644
index 2f1f4247236..00000000000
--- a/srcpkgs/libgweather/libgweather-python.template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgweather-python'.
-#
-short_desc="${sourcepkg} - python bindings"
-long_desc="${long_desc}
-
- This package contains the python bindings."
-
-revision=2
-
-Add_dependency run glibc
-Add_dependency run gtk+
-Add_dependency run atk
-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 libxml2
-Add_dependency run libsoup-gnome
-Add_dependency run libsoup
-Add_dependency run glib
-Add_dependency run GConf
-Add_dependency run python
-Add_dependency run libgweather
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libgweather/patches/01_gettext_not_xml.patch b/srcpkgs/libgweather/patches/01_gettext_not_xml.patch
deleted file mode 100644
index ab9a8bed508..00000000000
--- a/srcpkgs/libgweather/patches/01_gettext_not_xml.patch
+++ /dev/null
@@ -1,544 +0,0 @@
-Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information.
-Author: ?
-
-only in patch2:
-unchanged:
-Index: libgweather-2.30.2/configure.in
-===================================================================
---- libgweather-2.30.2.orig/configure.in 2010-06-22 05:01:54.000000000 +0200
-+++ libgweather-2.30.2/configure.in 2010-06-24 10:49:23.000000000 +0200
-@@ -40,6 +40,10 @@
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
-
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.3])
- PKG_PROG_PKG_CONFIG([0.19])
-
-@@ -50,13 +54,6 @@
- AM_PROG_LIBTOOL
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
-
--AC_ARG_ENABLE(all-translations-in-one-xml,
-- [AC_HELP_STRING([--enable-all-translations-in-one-xml],
-- [Put all translations in a big Locations.xml file (slow to parse)])],
-- [enable_big_xml=yes],
-- [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
- [AC_HELP_STRING([--enable-locations-compression],
- [Compress Locations.xml files])],
-@@ -253,7 +250,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather.pc
- libgweather/gweather-uninstalled.pc
-@@ -262,12 +259,6 @@
- icons/Makefile
- ])
-
--if test "x$enable_big_xml" = "xyes"; then
-- LOCATIONS_XML_TRANSLATIONS="one big file"
--else
-- LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary ***
- dnl ***************************************************************************
-@@ -278,6 +269,4 @@
- Source code location: ${srcdir}
- Compiler: ${CC}
- Python bindings: ${enable_python}
-- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
-- Locations.xml compression: ${enable_locations_compression}
- " >&2
-Index: libgweather-2.30.2/data/Makefile.am
-===================================================================
---- libgweather-2.30.2.orig/data/Makefile.am 2010-02-09 13:28:03.000000000 +0100
-+++ libgweather-2.30.2/data/Makefile.am 2010-06-24 10:49:23.000000000 +0200
-@@ -4,55 +4,23 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
-
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP =
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \
-- fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
-
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
-
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
-
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
-- for pofile in $(PO_LOCATIONS); do \
-- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \
-- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
-- rm -f $$locale/$(libgweatherlocations_data); \
-- test -d $$locale && rmdir $$locale; \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.$$locale.xml; \
-- fi; \
-- done && \
-- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
-- rm -f C/$(libgweatherlocations_data) && \
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \
-+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
-+ rm -f C/$(libgweatherlocations_DATA) && \
- test -d C && rmdir C && \
-- if test "x$(COMPRESS_EXT)" = "x.gz"; then \
-- gzip --force Locations.xml; \
-- fi && \
- touch $@
-
--endif # USE_ONE_BIG_XML
--
- check:
- xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
- $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-Index: libgweather-2.30.2/libgweather/gweather-location.c
-===================================================================
---- libgweather-2.30.2.orig/libgweather/gweather-location.c 2010-02-09 13:28:03.000000000 +0100
-+++ libgweather-2.30.2/libgweather/gweather-location.c 2010-06-24 10:49:23.000000000 +0200
-@@ -22,11 +22,14 @@
- #include
- #endif
-
-+#include "config.h"
-+
- #include
- #include
- #include
- #include
- #include
-+#include
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@
-
- tagname = (const char *) xmlTextReaderConstName (parser->xml);
- if (!strcmp (tagname, "name") && !loc->name) {
-- value = gweather_parser_get_localized_value (parser);
-+ char *context = NULL;
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+
-+ value = gweather_parser_get_value (parser);
- if (!value)
- goto error_out;
-- loc->name = g_strdup (value);
-+
-+ if (context != NULL) {
-+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+ xmlFree (context);
-+ }
-+ else
-+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+
- xmlFree (value);
- normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- loc->sort_name = g_utf8_casefold (normalized, -1);
-Index: libgweather-2.30.2/libgweather/gweather-timezone.c
-===================================================================
---- libgweather-2.30.2.orig/libgweather/gweather-timezone.c 2010-02-09 13:28:03.000000000 +0100
-+++ libgweather-2.30.2/libgweather/gweather-timezone.c 2010-06-24 10:49:23.000000000 +0200
-@@ -23,6 +23,7 @@
- #endif
-
- #include
-+#include
-
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@
- parse_timezone (GWeatherParser *parser)
- {
- GWeatherTimezone *zone = NULL;
-- char *id = NULL, *name = NULL;
-+ char *id = NULL, *name = NULL, *context = NULL;
- int offset = 0, dst_offset = 0;
- gboolean has_dst = FALSE;
-
-@@ -175,27 +176,34 @@
- continue;
- }
-
-- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
-- name = gweather_parser_get_localized_value (parser);
-+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt");
-+ name = gweather_parser_get_value (parser);
-+ }
- else {
- if (xmlTextReaderNext (parser->xml) != 1)
- break;
- }
- }
- }
--
-+
- if (parse_tzdata (id, parser->year_start, parser->year_end,
- &offset, &has_dst, &dst_offset)) {
- zone = g_slice_new0 (GWeatherTimezone);
- zone->ref_count = 1;
- zone->id = g_strdup (id);
-- zone->name = g_strdup (name);
-+ if (context != NULL)
-+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+ else
-+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- zone->offset = offset;
- zone->has_dst = has_dst;
- zone->dst_offset = dst_offset;
- }
-
- xmlFree (id);
-+ if (context)
-+ xmlFree (context);
- if (name)
- xmlFree (name);
-
-Index: libgweather-2.30.2/po-locations/LINGUAS
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-2.30.2/po-locations/LINGUAS 2010-06-24 10:49:23.000000000 +0200
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-Index: libgweather-2.30.2/po-locations/Makefile.in.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-2.30.2/po-locations/Makefile.in.in 2010-06-24 10:49:23.000000000 +0200
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper
-+# Copyright (C) 2004-2008 Rodney Dawes
-+#
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor to use GETTEXT_PACKAGE
-+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman to install
-+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+ $(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+ file=`echo $* | sed 's,.*/,,'`.gmo \
-+ && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+ sed -f ../intl/po2msg.sed < $< > $*.msg \
-+ && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+ $(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+ $(mkdir_p) $$dir; \
-+ if test -r $$lang.gmo; then \
-+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+ else \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+ echo "installing $(srcdir)/$$lang.gmo as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+ fi; \
-+ if test -r $$lang.gmo.m; then \
-+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ if test -r $(srcdir)/$$lang.gmo.m ; then \
-+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+ echo "installing $(srcdir)/$$lang.gmo.m as" \
-+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+ else \
-+ true; \
-+ fi; \
-+ fi; \
-+ done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+ done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+ rm -f missing notexist
-+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+ if [ -r missing -o -r notexist ]; then \
-+ exit 1; \
-+ fi
-+
-+mostlyclean:
-+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+ rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+ rm -f Makefile Makefile.in POTFILES stamp-it
-+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+ @echo "This command is intended for maintainers to use;"
-+ @echo "it deletes files that may require special tools to rebuild."
-+ rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+ dists="$(DISTFILES)"; \
-+ extra_dists="$(EXTRA_DISTFILES)"; \
-+ for file in $$extra_dists; do \
-+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+ done; \
-+ for file in $$dists; do \
-+ test -f $$file || file="$(srcdir)/$$file"; \
-+ ln $$file $(distdir) 2> /dev/null \
-+ || cp -p $$file $(distdir); \
-+ done
-+
-+update-po: Makefile
-+ $(MAKE) $(GETTEXT_PACKAGE).pot
-+ tmpdir=`pwd`; \
-+ linguas="$(USE_LINGUAS)"; \
-+ for lang in $$linguas; do \
-+ echo "$$lang:"; \
-+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+ if $$result; then \
-+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ else \
-+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+ :; \
-+ else \
-+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ exit 1; \
-+ fi; \
-+ fi; \
-+ else \
-+ echo "msgmerge for $$lang.gmo failed!"; \
-+ rm -f $$tmpdir/$$lang.new.po; \
-+ fi; \
-+ done
-+
-+Makefile POTFILES: stamp-it
-+ @if test ! -f $@; then \
-+ rm -f stamp-it; \
-+ $(MAKE) stamp-it; \
-+ fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+ $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: libgweather-2.30.2/po-locations/POTFILES.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-2.30.2/po-locations/POTFILES.in 2010-06-24 10:49:23.000000000 +0200
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/srcpkgs/libgweather/patches/99_ltmain_as-needed.patch b/srcpkgs/libgweather/patches/99_ltmain_as-needed.patch
deleted file mode 100644
index 452b61fb482..00000000000
--- a/srcpkgs/libgweather/patches/99_ltmain_as-needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: b/ltmain.sh
-===================================================================
---- a/ltmain.sh 2010-06-22 05:02:29.000000000 +0200
-+++ b/ltmain.sh 2010-07-27 18:32:30.105880012 +0200
-@@ -4716,6 +4716,11 @@
- arg=$func_stripname_result
- ;;
-
-+ -Wl,--as-needed)
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
- -Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -5067,6 +5072,15 @@
- lib=
- found=no
- case $deplib in
-+ -Wl,--as-needed)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ fi
-+ continue
-+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 450dfa23756..7f0d6fa7a42 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,57 +1,58 @@
# Template file for 'libgweather'
pkgname=libgweather
-version=2.30.3
-revision=1
-patch_args="-Np1"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --localstatedir=/var
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
---enable-locations-compression --enable-python
---with-zoneinfo-dir=/usr/share/zoneinfo"
+--enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo"
short_desc="Weather information access library"
maintainer="Juan RP "
-checksum=b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c
+checksum=f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545
long_desc="
libgweather is a library to access weather information from online
services for numerous locations."
gconf_schemas="gweather.schemas"
gtk_iconcache_dirs="/usr/share/icons/gnome"
-subpackages="$pkgname-devel $pkgname-python"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
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 gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run gtk+
Add_dependency run libxml2
-Add_dependency run GConf
+Add_dependency run gtk+3
Add_dependency run libsoup
Add_dependency run libsoup-gnome
-Add_dependency build automake
+Add_dependency run GConf
+
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build python-devel
Add_dependency build glib-devel
Add_dependency build atk-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 gtk+-devel
Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
+Add_dependency build gtk+3-devel
Add_dependency build libsoup-devel
Add_dependency build libsoup-gnome-devel
+Add_dependency build GConf-devel
+
Add_dependency full gnome-icon-theme
-pre_configure()
+post_install()
{
- cd ${wrksrc} && autoreconf -fi
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname}-3.0 ${wrksrc}/*.schemas
}
diff --git a/srcpkgs/libidn/libidn-devel.template b/srcpkgs/libidn/libidn-devel.template
index 8f89aa1fc07..65aa47647e5 100644
--- a/srcpkgs/libidn/libidn-devel.template
+++ b/srcpkgs/libidn/libidn-devel.template
@@ -1,10 +1,11 @@
# Template file for 'libidn-devel'.
#
-short_desc="${sourcepkg} development files"
+short_desc="${short_desc} - development files"
long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
+Add_dependency run glibc-devel
Add_dependency run libidn
do_install()
@@ -16,4 +17,5 @@ do_install()
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+ mv ${SRCPKGDESTDIR}/usr/share/{emacs,info} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index f4cdcb0b78a..3fe3deca6ab 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -1,12 +1,12 @@
# Template build file for 'libidn'.
pkgname=libidn
-version=1.19
-distfiles="http://ftp.gnu.org/gnu/libidn/$pkgname-$version.tar.gz"
+version=1.20
+distfiles="http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz"
build_style=gnu_configure
-configure_args="--disable-csharp --disable-java"
+configure_args="--disable-csharp --disable-java --enable-threads=posix"
short_desc="Internationalized Domain Names command line tool"
maintainer="Juan RP "
-checksum=8ed2e936b1ae3e30b45b54ca3672deaa83ee0f4d20db5ad83dc1af7222d39f41
+checksum=e1bff472e8dce11064508ef5acbd6ac72371d0028f15c65f4a91ed157bfca8b1
long_desc="
GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
specifications defined by the IETF Internationalized Domain Names (IDN)
diff --git a/srcpkgs/libnice-devel b/srcpkgs/libnice-devel
new file mode 120000
index 00000000000..c89ce3d4680
--- /dev/null
+++ b/srcpkgs/libnice-devel
@@ -0,0 +1 @@
+libnice
\ No newline at end of file
diff --git a/srcpkgs/libnice/depends b/srcpkgs/libnice/depends
new file mode 100644
index 00000000000..140f5aa7a9d
--- /dev/null
+++ b/srcpkgs/libnice/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libnice/libnice-devel.template b/srcpkgs/libnice/libnice-devel.template
new file mode 100644
index 00000000000..34f09b38b1b
--- /dev/null
+++ b/srcpkgs/libnice/libnice-devel.template
@@ -0,0 +1,24 @@
+# Template file for 'libnice-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 libxml2-devel
+Add_dependency run gstreamer-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 libnice
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
new file mode 100644
index 00000000000..7db7f64a931
--- /dev/null
+++ b/srcpkgs/libnice/template
@@ -0,0 +1,40 @@
+# Template file for 'libnice'
+pkgname=libnice
+version=0.1.0
+distfiles="http://nice.freedesktop.org/releases/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-static"
+short_desc="An implementation of the IETF's draft ICE (for P2P UDP data streams)"
+maintainer="Juan RP "
+checksum=c79b85f53c63fc676c6f84f4a40a5e210106cc7856ba17580fc2716f36c720ff
+long_desc="
+ It provides a GLib-based library, libnice and a Glib-free library, libstun
+ as well as GStreamer elements.
+
+ ICE is useful for applications that want to establish peer-to-peer UDP data
+ streams. It automates the process of traversing NATs and provides security
+ against some attacks. It also allows applications to create reliable streams
+ using a TCP over UDP layer.
+
+ Existing standards that use ICE include Session Initiation Protocol (SIP)
+ and XMPP Jingle."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run gstreamer
+Add_dependency run libsoup
+Add_dependency run gssdp
+Add_dependency run gupnp
+Add_dependency run gupnp-igd
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build gstreamer-devel
+Add_dependency build libsoup-devel
+Add_dependency build gssdp-devel
+Add_dependency build gupnp-devel
+Add_dependency build gupnp-igd-devel
diff --git a/srcpkgs/libnotify/depends b/srcpkgs/libnotify/depends
index 39494e38104..4c0b4c554c1 100644
--- a/srcpkgs/libnotify/depends
+++ b/srcpkgs/libnotify/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.4.5"
+abi_depends=">=0.7"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libnotify/libnotify-devel.template b/srcpkgs/libnotify/libnotify-devel.template
index 3a0243b6aea..65eb5760644 100644
--- a/srcpkgs/libnotify/libnotify-devel.template
+++ b/srcpkgs/libnotify/libnotify-devel.template
@@ -6,15 +6,10 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
Add_dependency run pkg-config
-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 dbus-glib-devel
-Add_dependency run dbus-devel
+Add_dependency run libpng-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gobject-introspection
Add_dependency run libnotify
do_install()
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 6c2357f0e8e..3bc2f8a5158 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -1,11 +1,11 @@
# Template file for 'libnotify'
pkgname=libnotify
-version=0.5.2
-distfiles="${GNOME_SITE}/$pkgname/0.5/$pkgname-$version.tar.bz2"
+version=0.7.2
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Desktop notification library"
maintainer="Juan RP "
-checksum=1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062
+checksum=9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6
long_desc="
libnotify is an implementation of the freedesktop.org desktop
notification specification."
@@ -13,25 +13,12 @@ long_desc="
subpackages="$pkgname-devel"
Add_dependency run glibc
-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 libpng
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
Add_dependency build pkg-config
-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 dbus-glib-devel
-Add_dependency build dbus-devel
+Add_dependency build libpng-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gobject-introspection
diff --git a/srcpkgs/libpeas-devel b/srcpkgs/libpeas-devel
new file mode 120000
index 00000000000..f72cdee3a8d
--- /dev/null
+++ b/srcpkgs/libpeas-devel
@@ -0,0 +1 @@
+libpeas
\ No newline at end of file
diff --git a/srcpkgs/libpeas/depends b/srcpkgs/libpeas/depends
new file mode 100644
index 00000000000..a66f7dfdeb8
--- /dev/null
+++ b/srcpkgs/libpeas/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.0.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libpeas/libpeas-devel.template b/srcpkgs/libpeas/libpeas-devel.template
new file mode 100644
index 00000000000..2c5c5b72a3a
--- /dev/null
+++ b/srcpkgs/libpeas/libpeas-devel.template
@@ -0,0 +1,43 @@
+# Template file for 'libpeas-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libffi
+Add_dependency run libgirepository
+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
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run glib-devel
+Add_dependency run libffi-devel
+Add_dependency run python-devel
+Add_dependency run libgirepository-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-devel
+Add_dependency run cairo-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run gtk+3-devel
+Add_dependency run libpeas
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/{lib,share}
+ mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/{peas-demo,pkgconfig} ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+
+}
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
new file mode 100644
index 00000000000..2361821d1a6
--- /dev/null
+++ b/srcpkgs/libpeas/template
@@ -0,0 +1,51 @@
+# Template file for 'libpeas'
+pkgname=libpeas
+version=1.0.0
+distfiles="${GNOME_SITE}/$pkgname/1.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var"
+short_desc="Gobject-based plugins engine"
+maintainer="Juan RP "
+checksum=b1482690565241baf3870311a77efb3f89a4335f48cb4ca31e8b8405220a8d99
+long_desc="
+ libpeas is a gobject-based plugins engine, and is targetted at giving every
+ application the chance to assume its own extensibility. It is currently used by
+ several Gnome applications like gedit and Totem.
+
+ It takes its roots in the old gedit plugins engine, and provides an extensive set
+ of features mirroring the desiderata of most of the applications providing an
+ extension framework."
+
+subpackages="$pkgname-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libffi
+Add_dependency run python
+Add_dependency run libgirepository
+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
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build libffi-devel
+Add_dependency build python-devel
+Add_dependency build libgirepository-devel
+Add_dependency build atk-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 gtk+3-devel
+
+Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/libpostproc b/srcpkgs/libpostproc
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libpostproc
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 69a6ad97736..b4a99368d8e 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,11 +1,12 @@
# Template build file for 'librsvg'.
pkgname=librsvg
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.34.0
+distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-short_desc="SVG library for GNOME2"
+configure_args="--with-svgz"
+short_desc="SVG library for GNOME"
maintainer="Juan RP "
-checksum=91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
+checksum=9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd
long_desc="
librsvg is Raph's scalable vector graphics library. It provides support for
SVG graphics, and is used by the GNOME desktop.
@@ -18,10 +19,7 @@ subpackages="$pkgname-devel"
Add_dependency run glib
Add_dependency run glibc
-Add_dependency run libgsf
-Add_dependency run libcroco
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
Add_dependency run libxml2
Add_dependency run pango
Add_dependency run cairo
@@ -29,6 +27,10 @@ Add_dependency run libpng
Add_dependency run fontconfig
Add_dependency run freetype
Add_dependency run atk
+Add_dependency run libgsf
+Add_dependency run libcroco
+Add_dependency run gtk+
+Add_dependency run gtk+3
Add_dependency build pkg-config
Add_dependency build intltool
@@ -38,7 +40,6 @@ Add_dependency build glibc-devel
Add_dependency build libgsf-devel
Add_dependency build libcroco-devel
Add_dependency build gdk-pixbuf-devel
-Add_dependency build gtk+-devel
Add_dependency build libxml2-devel
Add_dependency build pango-devel
Add_dependency build cairo-devel
@@ -46,6 +47,8 @@ Add_dependency build libpng-devel
Add_dependency build fontconfig-devel
Add_dependency build freetype-devel
Add_dependency build atk-devel
+Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
post_install()
{
diff --git a/srcpkgs/libsigc++/template b/srcpkgs/libsigc++/template
index 47698478336..91b9a46483b 100644
--- a/srcpkgs/libsigc++/template
+++ b/srcpkgs/libsigc++/template
@@ -1,11 +1,11 @@
# Template file for 'libsigc++'
pkgname=libsigc++
-version=2.2.7
+version=2.2.9
distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Type-safe callback system for C++ programs"
maintainer="Juan RP "
-checksum=2b8cc4670714458cd4fecefb00e7d5d2c717ae9b1963a057e7ebca1cd93baafa
+checksum=2f4c083e01d9be377669206bd97090d2e95bc05f2e8d95447c9f9ce92bdfbb63
long_desc="
libsigc++ implements a full callback system for use in widget
libraries, abstract interfaces, and general programming. Originally
@@ -22,3 +22,4 @@ Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
Add_dependency build libstdc++-devel
+Add_dependency build doxygen
diff --git a/srcpkgs/libsoup/depends b/srcpkgs/libsoup/depends
index a3fd0750ce2..a0e143ef368 100644
--- a/srcpkgs/libsoup/depends
+++ b/srcpkgs/libsoup/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.27.5"
+abi_depends=">=2.34.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libsoup/gir-libsoup.template b/srcpkgs/libsoup/gir-libsoup.template
deleted file mode 100644
index 066c45fda6e..00000000000
--- a/srcpkgs/libsoup/gir-libsoup.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libsoup'.
-#
-short_desc="Introspection data for GNOME's libsoup"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- libsoup libraries."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libsoup/libsoup-gnome-devel.template b/srcpkgs/libsoup/libsoup-gnome-devel.template
index 0e3b1638727..c7b8199e119 100644
--- a/srcpkgs/libsoup/libsoup-gnome-devel.template
+++ b/srcpkgs/libsoup/libsoup-gnome-devel.template
@@ -12,8 +12,6 @@ Add_dependency run gnutls-devel
Add_dependency run libgcrypt-devel
Add_dependency run libgpg-error-devel
Add_dependency run glib-devel
-Add_dependency run GConf-devel
-Add_dependency run libproxy-devel
Add_dependency run sqlite-devel
Add_dependency run libgnome-keyring-devel
Add_dependency run libsoup-gnome
diff --git a/srcpkgs/libsoup/libsoup-gnome.template b/srcpkgs/libsoup/libsoup-gnome.template
index 927ea117c9e..b7e87bd4820 100644
--- a/srcpkgs/libsoup/libsoup-gnome.template
+++ b/srcpkgs/libsoup/libsoup-gnome.template
@@ -12,14 +12,14 @@ Add_dependency run gnutls
Add_dependency run libgcrypt
Add_dependency run libgpg-error
Add_dependency run glib
-Add_dependency run GConf
-Add_dependency run libproxy
Add_dependency run sqlite
Add_dependency run libgnome-keyring
Add_dependency run libsoup
do_install()
{
- mkdir -p ${DESTDIR}/usr/lib
+ mkdir -p ${DESTDIR}/usr/lib/girepository-1.0
mv ${SRCPKGDESTDIR}/usr/lib/libsoup-gnome*.so* ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0/SoupGNOME* \
+ ${DESTDIR}/usr/lib/girepository-1.0
}
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index e2b01018c2d..e81be319759 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -1,12 +1,12 @@
# Template file for 'libsoup'
pkgname=libsoup
-version=2.32.2
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.34.0
+distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="HTTP library implementation in C"
maintainer="Juan RP "
-checksum=96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f
+checksum=bb7b8f4ab72923c8bdaf83ad9655e946c4c68ee6957b82eb0e20586c1ad627e7
long_desc="
Libsoup is an HTTP library implementation in C. It was originally part
of a SOAP (Simple Object Access Protocol) implementation called Soup, but
@@ -28,7 +28,8 @@ long_desc="
* HTTP server
* Server support for Digest and Basic authentication"
-subpackages="gir-$pkgname $pkgname-gnome $pkgname-gnome-devel $pkgname-devel"
+subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel"
+
Add_dependency run glibc
Add_dependency run zlib
Add_dependency run libxml2
@@ -43,9 +44,9 @@ Add_dependency build glib-devel
Add_dependency build libgcrypt-devel
Add_dependency build libgpg-error-devel
Add_dependency build libxml2-devel
-Add_dependency build libproxy-devel
Add_dependency build gnutls-devel
Add_dependency build sqlite-devel
-Add_dependency build GConf-devel
Add_dependency build libgnome-keyring-devel
Add_dependency build gobject-introspection
+
+Add_dependency full glib-networking
diff --git a/srcpkgs/libswscale b/srcpkgs/libswscale
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libswscale
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libunique/depends b/srcpkgs/libunique/depends
index 9ee6dd9885e..f068513a835 100644
--- a/srcpkgs/libunique/depends
+++ b/srcpkgs/libunique/depends
@@ -1,2 +1,2 @@
-abi_depends=">=1.0.8"
+abi_depends=">=2.91.4"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libunique/gir-libunique.template b/srcpkgs/libunique/gir-libunique.template
deleted file mode 100644
index b2cb12dc39e..00000000000
--- a/srcpkgs/libunique/gir-libunique.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libunique'.
-#
-short_desc="Introspection data for libunique"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- libunique library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libunique/libunique-devel.template b/srcpkgs/libunique/libunique-devel.template
index ab722fe7c9c..348007e177e 100644
--- a/srcpkgs/libunique/libunique-devel.template
+++ b/srcpkgs/libunique/libunique-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 libX11-devel
Add_dependency run atk-devel
@@ -24,7 +22,6 @@ do_install()
{
mkdir -p ${DESTDIR}/usr/lib
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 ${DESTDIR}/usr
}
diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template
index d2b53556414..25d4b8c8fdc 100644
--- a/srcpkgs/libunique/template
+++ b/srcpkgs/libunique/template
@@ -1,13 +1,12 @@
# Template file for 'libunique'.
pkgname=libunique
-version=1.1.6
-revision=2
-distfiles="${GNOME_SITE}/$pkgname/1.1/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-bacon=yes --enable-dbus=yes"
short_desc="Library for writing single instance applications"
-maintainer="pancake "
-checksum=e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
+maintainer="xtraeme "
+checksum=e945ff3d3bb7d4085ed73b5418f2935097bb0afc07287739c8f0d6fc049202e1
long_desc="
Unique is a library for writing single instance application. If you launch a
single instance application twice, the second instance will either just quit
@@ -20,8 +19,7 @@ long_desc="
Unique aims to replace the BaconMessageConnection code that has been copied
by many projects and the code using Bonobo and D-Bus."
-disable_parallel_build=yes
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
@@ -35,7 +33,7 @@ Add_dependency run fontconfig
Add_dependency run libX11
Add_dependency run libpng
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run gtk+3
Add_dependency build pkg-config
Add_dependency build libX11-devel
@@ -47,5 +45,5 @@ Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build dbus-devel
Add_dependency build dbus-glib-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build gobject-introspection
diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx-devel
new file mode 120000
index 00000000000..230e0dffa9e
--- /dev/null
+++ b/srcpkgs/libvpx-devel
@@ -0,0 +1 @@
+libvpx
\ No newline at end of file
diff --git a/srcpkgs/libvpx/depends b/srcpkgs/libvpx/depends
new file mode 100644
index 00000000000..b128089b5d9
--- /dev/null
+++ b/srcpkgs/libvpx/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.9.6"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libvpx/libvpx-devel.template b/srcpkgs/libvpx/libvpx-devel.template
new file mode 100644
index 00000000000..6d5c399ee5e
--- /dev/null
+++ b/srcpkgs/libvpx/libvpx-devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libvpx-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run yasm
+Add_dependency run glibc-devel
+Add_dependency run libvpx
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template
new file mode 100644
index 00000000000..5367c8db76c
--- /dev/null
+++ b/srcpkgs/libvpx/template
@@ -0,0 +1,23 @@
+# Template file for 'libvpx'
+pkgname=libvpx
+version=0.9.6
+wrksrc="libvpx-v${version}"
+distfiles="http://webm.googlecode.com/files/${pkgname}-v${version}.tar.bz2"
+build_style=configure
+configure_args="--enable-vp8 --enable-runtime-cpu-detect --enable-shared
+--enable-postproc --enable-pic --disable-install-docs --disable-install-srcs"
+make_install_target="DIST_DIR=${XBPS_DESTDIR}/${pkgname}-${version}/usr install"
+short_desc="The VP8 Codec SDK"
+maintainer="Juan RP "
+checksum=28bd8a8ef216fb570912f0d378668051d99681bf13735b59e68a12ad79f2aa73
+long_desc="
+ WebM is an open, royalty-free, media file format designed for the web.
+
+ WebM defines the file container structure, video and audio formats. WebM
+ files consist of video streams compressed with the VP8 video codec and audio
+ streams compressed with the Vorbis audio codec. The WebM file structure is
+ based on the Matroska container."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency build yasm
diff --git a/srcpkgs/libwnck/depends b/srcpkgs/libwnck/depends
index 000141419c4..6e8d7e9a547 100644
--- a/srcpkgs/libwnck/depends
+++ b/srcpkgs/libwnck/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.26.1"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/libwnck/gir-libwnck.template b/srcpkgs/libwnck/gir-libwnck.template
deleted file mode 100644
index 0dc615f2132..00000000000
--- a/srcpkgs/libwnck/gir-libwnck.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-libwnck'.
-#
-short_desc="Introspection data for GNOME's libwnck"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- libwnck library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 42310763de1..ff6822e6e8f 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,39 +1,45 @@
# Template build file for 'libwnck'.
pkgname=libwnck
-version=2.30.6
-distfiles="${GNOME_SITE}/libwnck/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/libwnck/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Library for layout and rendering of text"
maintainer="Juan RP "
-checksum=4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5
+checksum=bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15
long_desc="
libwnck is Window Navigator Construction Kit, i.e. a library to use
for writing pagers and taskslists and stuff."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run atk
-Add_dependency run cairo
-Add_dependency run fontconfig
-Add_dependency run freetype
Add_dependency run glib
+Add_dependency run atk
Add_dependency run pango
-Add_dependency run gdk-pixbuf
+Add_dependency run freetype
+Add_dependency run fontconfig
Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
Add_dependency run startup-notification
Add_dependency run libX11
Add_dependency run libXres
+Add_dependency run gtk+3
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build freetype-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libX11-devel
-Add_dependency build libXres-devel
Add_dependency build gobject-introspection
+Add_dependency build glib-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libpng-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
+Add_dependency build startup-notification-devel
+Add_dependency build libXres-devel
+Add_dependency build libX11-devel
+Add_dependency build gtk+3-devel
+
diff --git a/srcpkgs/lightdm/gir-lightdm.template b/srcpkgs/lightdm/gir-lightdm.template
deleted file mode 100644
index 588dceac842..00000000000
--- a/srcpkgs/lightdm/gir-lightdm.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gir-lightdm.
-#
-short_desc="${short_desc} - Introspection data"
-long_desc="${long_desc}
-
- This package contains GObject introspection data for LightDM."
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/gir* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template
index 1762814c33b..06c2cea3c4d 100644
--- a/srcpkgs/lightdm/liblightdm-gobject.template
+++ b/srcpkgs/lightdm/liblightdm-gobject.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
This package contains the GObject support library for LightDM."
+revision=1
+
Add_dependency run glibc
Add_dependency run dbus-libs
Add_dependency run glib
@@ -17,4 +19,5 @@ do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/liblightdm-gobject*.so* ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index e68c31f97f6..87d1941e823 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -21,7 +21,7 @@ lightdm_homedir="/var/cache/lightdm"
openrc_services="lightdm default true"
keep_empty_dirs=yes
-subpackages="gir-lightdm liblightdm-gobject liblightdm-qt"
+subpackages="liblightdm-gobject liblightdm-qt"
subpackages="${subpackages} lightdm-webkit lightdm-devel"
Add_dependency run glibc
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index f448c9af6aa..f38ef979e2b 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,11 +1,11 @@
# Template file for 'linux-firmware'
pkgname=linux-firmware
-version=20110119
+version=20110303
distfiles=http://xbps.nopcode.org/distfiles/$pkgname-$version.tar.xz
build_style=custom-install
short_desc="Binary firmware blobs for the Linux kernel"
maintainer="Juan RP "
-checksum=b0451b45aa6ec7406905a1223046abaf2187402ba50271cce0c1cff583b286f0
+checksum=d029e89bc853c7e9d14ea06f9e8ba5ea96a2c8292d31bb4ea3e06cd884ddd009
long_desc="
This package provides binary firmware blobs for misc hardware supported by
the Linux kernel."
@@ -26,7 +26,7 @@ do_install()
install -d ${DESTDIR}/lib/firmware
install -d ${DESTDIR}/usr/share/licenses/${pkgname}
cp -a * ${DESTDIR}/lib/firmware
- rm -f ${DESTDIR}/lib/firmware/GPL
+ rm -f ${DESTDIR}/lib/firmware/GPL{,-3}
mv ${DESTDIR}/lib/firmware/{LICEN*,WHENCE} \
${DESTDIR}/usr/share/licenses/${pkgname}
# Symlinks for Broadcom firmware
diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm-sensors/template
index bd11e2a8aff..dfab6fff1b0 100644
--- a/srcpkgs/lm-sensors/template
+++ b/srcpkgs/lm-sensors/template
@@ -1,6 +1,6 @@
# Template file for 'lm-sensors'
pkgname=lm-sensors
-version=3.2.0
+version=3.3.0
wrksrc="lm_sensors-${version}"
distfiles="http://dl.lm-sensors.org/$pkgname/releases/lm_sensors-$version.tar.bz2"
build_style=gnu_makefile
@@ -8,7 +8,7 @@ make_build_target="all"
make_install_args="PREFIX=/usr MANDIR=/usr/share/man"
short_desc="Utilities to read temperature/voltage/fan sensors"
maintainer="Juan RP "
-checksum=bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581
+checksum=145c222e4611cedb2d16efb2700164f599297b2124c4dc30af4fc89c417cc20f
long_desc="
$pkgname provides most complete hardware health monitoring support for
Linux, in the form of kernel drivers and a user-space library"
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a06b9817c82..d8df1a44c6d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,11 +1,11 @@
# Template file for 'mercurial'
pkgname=mercurial
-version=1.8
+version=1.8.1
distfiles="http://mercurial.selenic.com/release/$pkgname-$version.tar.gz"
build_style=python-module
short_desc="Fast, lightweight source control management system"
maintainer="Juan RP "
-checksum=421d19151f754d8452b5cf0817e0bbac2f74d93a4f76f9de41fc7a7f33c5db93
+checksum=fadea043641b003132249fd440329c42fa9f03534bdd51ac98404b5dbc88aa31
long_desc="
Mercurial is a fast, lightweight Source Control Management system
designed for efficient handling of very large distributed projects.
@@ -52,7 +52,6 @@ Add_dependency build gettext
post_install()
{
- cd ${wrksrc}
install -d ${DESTDIR}/usr/share/man/man1
install -d ${DESTDIR}/usr/share/man/man5
install -m 644 doc/*.1 ${DESTDIR}/usr/share/man/man1
diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 0167bf9d4b3..336212fba89 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,13 +1,13 @@
# Template file for 'metacity'
pkgname=metacity
-version=2.30.3
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=2.34.0
+distfiles="${GNOME_SITE}/$pkgname/2.34/$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="GNOME-compliant window manager"
maintainer="Juan RP "
-checksum=08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd
+checksum=e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698
long_desc="
Metacity is not a meta-City as in an urban center, but rather Meta-ness as in
the state of being meta. i.e. metacity : meta as opacity : opaque. Also
@@ -67,3 +67,10 @@ Add_dependency build libX11-devel
Add_dependency build libXext-devel
Add_dependency build libXinerama-devel
Add_dependency full zenity
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index 4b05592a8da..7306bd0995a 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -1,10 +1,11 @@
# Template file for 'midori'
pkgname=midori
version=0.3.2
+revision=2
distfiles="http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-nls --enable-docs --disable-userdocs
---enable-unique --enable-libidn --enable-libnotify
+--disable-unique --enable-libidn --enable-libnotify
--enable-addons --disable-hildon --disable-apidocs"
short_desc="Lightweight web browser using WebKit GTK+"
maintainer="Juan RP "
@@ -24,9 +25,9 @@ conf_files="/etc/xdg/midori/search"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
+Add_dependency run libssl
Add_dependency run libnotify
Add_dependency run libsoup
-Add_dependency run libunique
Add_dependency run webkit-gtk
Add_dependency run sqlite
Add_dependency run atk
@@ -42,6 +43,7 @@ Add_dependency run libxml2
Add_dependency run dbus-glib
Add_dependency run dbus-libs
Add_dependency run libX11
+Add_dependency run libXScrnSaver
Add_dependency build atk-devel
Add_dependency build glib-devel
@@ -60,10 +62,10 @@ Add_dependency build librsvg-devel
Add_dependency build python
Add_dependency build libnotify-devel
Add_dependency build libsoup-devel
-Add_dependency build libunique-devel
Add_dependency build webkit-gtk-devel
Add_dependency build sqlite-devel
Add_dependency build libXext-devel
+Add_dependency build libXScrnSaver-devel
Add_dependency build vala-devel
Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/mutter-devel b/srcpkgs/mutter-devel
new file mode 120000
index 00000000000..9c8407d026f
--- /dev/null
+++ b/srcpkgs/mutter-devel
@@ -0,0 +1 @@
+mutter
\ No newline at end of file
diff --git a/srcpkgs/mutter/depends b/srcpkgs/mutter/depends
new file mode 100644
index 00000000000..6e8d7e9a547
--- /dev/null
+++ b/srcpkgs/mutter/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.91.90"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/mutter/mutter-devel.template b/srcpkgs/mutter/mutter-devel.template
new file mode 100644
index 00000000000..9280bfb225c
--- /dev/null
+++ b/srcpkgs/mutter/mutter-devel.template
@@ -0,0 +1,15 @@
+# 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 ${DESTDIR}/usr/share/gir-1.0
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/mutter/*.gir ${DESTDIR}/usr/share/gir-1.0
+}
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
new file mode 100644
index 00000000000..e61e8cd4fb4
--- /dev/null
+++ b/srcpkgs/mutter/template
@@ -0,0 +1,95 @@
+# Template file for 'mutter'
+pkgname=mutter
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --disable-scrollkeeper
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas
+--disable-schemas-install"
+short_desc="Lightweight GTK+3 window manager"
+maintainer="Juan RP "
+checksum=2560c8b3b5d47f0f4d4440c3087da76765b6ad9de6010662983846a3fed87eb2
+long_desc="
+ Mutter is a small window manager, using GTK+ and Clutter to do everything.
+
+ Mutter is the clutter-based evolution of Metacity, which, as the author says,
+ is a 'Boring window manager for the adult in you. Many window managers are
+ like Marshmallow Froot Loops; Metacity is like Cheerios.'"
+
+gconf_schemas="mutter.schemas"
+subpackages="mutter-devel"
+
+Add_dependency run glibc
+Add_dependency run gtk+3
+Add_dependency run glib
+Add_dependency run libX11
+Add_dependency run gdk-pixbuf
+Add_dependency run GConf
+Add_dependency run startup-notification
+Add_dependency run libcanberra
+Add_dependency run libXrender
+Add_dependency run clutter
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run MesaLib
+Add_dependency run libXdamage
+Add_dependency run libXcomposite
+Add_dependency run cairo
+Add_dependency run libXfixes
+Add_dependency run libgirepository
+Add_dependency run libXcursor
+Add_dependency run libXrandr
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libXext
+Add_dependency run libXinerama
+Add_dependency run json-glib
+Add_dependency run libpng
+Add_dependency run libdrm
+Add_dependency run libXi
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libffi
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build gtk+3-devel
+Add_dependency build glib-devel
+Add_dependency build libX11-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build GConf-devel
+Add_dependency build startup-notification-devel
+Add_dependency build libcanberra-devel
+Add_dependency build libXrender-devel
+Add_dependency build clutter-devel
+Add_dependency build atk-devel
+Add_dependency build pango-devel
+Add_dependency build MesaLib-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build cairo-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libgirepository-devel
+Add_dependency build libXcursor-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libXext-devel
+Add_dependency build libXinerama-devel
+Add_dependency build json-glib-devel
+Add_dependency build libpng-devel
+Add_dependency build libdrm-devel
+Add_dependency build libXi-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libffi-devel
+
+Add_dependency full desktop-file-utils
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
diff --git a/srcpkgs/nautilus-sendto/depends b/srcpkgs/nautilus-sendto/depends
index 6a11fcf61de..0edbddbd1a9 100644
--- a/srcpkgs/nautilus-sendto/depends
+++ b/srcpkgs/nautilus-sendto/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.32.0"
+abi_depends=">=2.91.6"
api_depends="${abi_depends}"
diff --git a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
index 7c271f03994..c58dd815f42 100644
--- a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
+++ b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
@@ -1,23 +1,13 @@
# Template file for 'nautilus-sendto-devel'.
#
-short_desc="${sourcepkg} - development files"
+short_desc="${short_desc} - development files"
long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
Add_dependency run pkg-config
-Add_dependency run nautilus-devel
-Add_dependency run gtk+-devel
-Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run cairo-devel
-Add_dependency run libpng-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
+Add_dependency run intltool
+Add_dependency run gnome-doc-utils
Add_dependency run evolution-data-server-devel
Add_dependency run nspr-devel
Add_dependency run nss-devel
@@ -25,8 +15,20 @@ Add_dependency run sqlite-devel
Add_dependency run libxml2-devel
Add_dependency run GConf-devel
Add_dependency run libsoup-devel
-Add_dependency run gssdp-devel
+Add_dependency run gtk+3-devel
+Add_dependency run atk-devel
+Add_dependency run glib-devel
+Add_dependency run pango-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run libpng-devel
+Add_dependency run cairo-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run dbus-devel
Add_dependency run gupnp-devel
+Add_dependency run gssdp-devel
+Add_dependency run nautilus-devel
do_install()
{
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
index 44e7b578773..f67768a798c 100644
--- a/srcpkgs/nautilus-sendto/template
+++ b/srcpkgs/nautilus-sendto/template
@@ -1,12 +1,12 @@
# Template file for 'nautilus-sendto'
pkgname=nautilus-sendto
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-compile --localstatedir=/var"
short_desc="Nautilus context menu for sending files"
maintainer="Juan RP "
-checksum=890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a
+checksum=8821c6aab186ff3aa852438b4f2b64dce9f68e264908ce009e331bac74969e21
long_desc="
The Nautilus Send To plugin provides the Nautilus file manager with a context
menu component for quickly sending files to accounts in an Evolution email
@@ -21,18 +21,6 @@ triggers="gsettings-schemas"
# XXX: add pidgin and gajim depends for plugins to work.
Add_dependency run glibc
-Add_dependency run nautilus
-Add_dependency run gtk+
-Add_dependency run atk
-Add_dependency run glib
-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 evolution-data-server
Add_dependency run nspr
Add_dependency run nss
@@ -40,24 +28,23 @@ Add_dependency run sqlite
Add_dependency run libxml2
Add_dependency run GConf
Add_dependency run libsoup
-Add_dependency run gssdp
+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 dbus-glib
+Add_dependency run dbus-libs
Add_dependency run gupnp
+Add_dependency run gssdp
+Add_dependency run nautilus
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build gnome-doc-utils
-Add_dependency build nautilus-devel
-Add_dependency build gtk+-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 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 evolution-data-server-devel
Add_dependency build nspr-devel
Add_dependency build nss-devel
@@ -65,5 +52,17 @@ Add_dependency build sqlite-devel
Add_dependency build libxml2-devel
Add_dependency build GConf-devel
Add_dependency build libsoup-devel
-Add_dependency build gssdp-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 dbus-glib-devel
+Add_dependency build dbus-devel
Add_dependency build gupnp-devel
+Add_dependency build gssdp-devel
+Add_dependency build nautilus-devel
diff --git a/srcpkgs/nautilus/depends b/srcpkgs/nautilus/depends
index 071d27b792a..6e8d7e9a547 100644
--- a/srcpkgs/nautilus/depends
+++ b/srcpkgs/nautilus/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
api_depends="${abi_depends}"
diff --git a/srcpkgs/nautilus/gir-nautilus.template b/srcpkgs/nautilus/gir-nautilus.template
deleted file mode 100644
index 846015d28d1..00000000000
--- a/srcpkgs/nautilus/gir-nautilus.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-nautilus'.
-#
-short_desc="Introspection data for GNOME Nautilus"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME
- Nautilus libraries."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 3c9fb184238..803a5feef77 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,80 +1,57 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=2.32.2.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--localstatedir=/var --disable-schemas-install
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-update-mimedb"
+configure_args="--localstatedir=/var --disable-update-mimedb
+--disable-schemas-compile --disable-nst-extension --disable-debug"
short_desc="The GNOME shell and file manager"
maintainer="Juan RP "
-checksum=802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
+checksum=6842be325c7acd5bb889ed93dfb1ed8b9ccc4a1ff7e034cb083895e74e59ebe3
long_desc="
Nautilus is the official file manager for the GNOME desktop. It is
designed to be primarly a file manager, but there is support for web and
file viewing too."
-triggers="mimedb"
+triggers="mimedb gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-gconf_schemas="apps_nautilus_preferences.schemas"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run glib
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 libSM
-Add_dependency run libICE
-Add_dependency run libXrender
-Add_dependency run libXext
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run startup-notification
-Add_dependency run libunique
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libxml2
Add_dependency run libX11
+Add_dependency run gtk+3
+Add_dependency run libnotify
Add_dependency run libexif
Add_dependency run exempi
-Add_dependency run GConf
+Add_dependency run libxml2
Add_dependency run gnome-desktop
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build glib-devel
+Add_dependency build gobject-introspection
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 libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libXrender-devel
-Add_dependency build libXext-devel
-Add_dependency build gtk+-devel
-Add_dependency build startup-notification-devel
-Add_dependency build libunique-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build libxml2-devel
Add_dependency build libX11-devel
+Add_dependency build gtk+3-devel
+Add_dependency build libnotify-devel
Add_dependency build libexif-devel
Add_dependency build exempi-devel
-Add_dependency build GConf-devel
+Add_dependency build libxml2-devel
Add_dependency build gnome-desktop-devel
-Add_dependency build diffutils
-Add_dependency build gobject-introspection
-Add_dependency full gvfs
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
-
-pre_configure()
-{
- # Use cmp(1) from diffutils.
- export PATH="/usr/bin:$PATH"
-}
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 8e9fa9c4686..c7cffa74410 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,13 +1,14 @@
# Template file for 'network-manager-applet'
pkgname=network-manager-applet
-version=0.8.2
+version=0.8.998
distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+--with-gconf-schema-file-dir=/usr/share/gconf/schemas --with-bluetooth
+--disable-static"
short_desc="NetworkManager panel applet for GNOME"
maintainer="Juan RP "
-checksum=c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391
+checksum=0a16e2ae00312062d4cd140d811227b84ac69e7d9487f6a84810f3d461894a82
long_desc="
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
@@ -27,44 +28,50 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
# XXX: mobile-broadband-provier-info deps.
Add_dependency run glibc
-Add_dependency run NetworkManager
-Add_dependency run libglade
-Add_dependency run libxml2
-Add_dependency run GConf
-Add_dependency run libgnome-keyring
-Add_dependency run libnotify
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run dbus-glib
-Add_dependency run atk
Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
Add_dependency run pango
+Add_dependency run gdk-pixbuf
Add_dependency run cairo
+Add_dependency run atk
+Add_dependency run libpng
Add_dependency run freetype
Add_dependency run fontconfig
-Add_dependency run dbus-libs
+Add_dependency run gtk+3
+Add_dependency run NetworkManager
+Add_dependency run libnotify
+Add_dependency run GConf
+Add_dependency run libgnome-keyring
Add_dependency run gnome-bluetooth
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build NetworkManager-devel
-Add_dependency build libglade-devel
-Add_dependency build libxml2-devel
Add_dependency build GConf-devel
Add_dependency build libgnome-keyring-devel
-Add_dependency build libnotify-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
+Add_dependency build NetworkManager-devel
Add_dependency build dbus-glib-devel
-Add_dependency build atk-devel
+Add_dependency build dbus-devel
Add_dependency build glib-devel
+Add_dependency build libnotify-devel
Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
Add_dependency build cairo-devel
+Add_dependency build gnome-bluetooth-devel
+Add_dependency build atk-devel
+Add_dependency build libpng-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build dbus-devel
-Add_dependency build gnome-bluetooth-devel
Add_dependency full notification-daemon
Add_dependency full hicolor-icon-theme
Add_dependency full polkit-gnome
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain nm-applet ${wrksrc}/*.schemas
+}
+
diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template
index f7704693eb9..29509afb444 100644
--- a/srcpkgs/notification-daemon/template
+++ b/srcpkgs/notification-daemon/template
@@ -1,66 +1,36 @@
# Template file for 'notification-daemon'
pkgname=notification-daemon
-version=0.5.0
-distfiles="${GNOME_SITE}/$pkgname/0.5/$pkgname-$version.tar.bz2"
+version=0.7.1
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-static"
+configure_args="--localstatedir=/var --disable-static"
short_desc="Shows notification messages on the desktop"
maintainer="Juan RP "
-checksum=aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475
+checksum=d26bf9021b3ae708d36e55437642a89d6b81693fe39d27c5d1ec869e22697b8b
long_desc="
notification-daemon is an application that shows notifications sent by
other applications on your desktop in the form of popups. It is based
on the libnotify library."
conflicts="xfce4-notifyd>=0"
-gconf_schemas="$pkgname.schemas"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
-Add_dependency run dbus-libs
-Add_dependency run dbus-glib
-Add_dependency run atk
Add_dependency run glib
-Add_dependency run pango
+Add_dependency run atk
Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run gtk+
-Add_dependency run libsexy
-Add_dependency run libxml2
-Add_dependency run libX11
-Add_dependency run libglade
-Add_dependency run libnotify
-Add_dependency run libwnck
-Add_dependency run libcanberra
Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run gstreamer
-Add_dependency run GConf
+Add_dependency run libX11
+Add_dependency run gtk+3
+Add_dependency run libcanberra ">=0.28_1" # gtk+3 support
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build libsexy-devel
-Add_dependency build libxml2-devel
-Add_dependency build GConf-devel
-Add_dependency build libwnck-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 gstreamer-devel
-Add_dependency build libX11-devel
-Add_dependency build libglade-devel
-Add_dependency build libnotify-devel
-Add_dependency build libcanberra-devel
+Add_dependency build atk-devel
Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
+Add_dependency build cairo-devel
+Add_dependency build libX11-devel
+Add_dependency build gtk+3-devel
+Add_dependency build libcanberra-devel
-Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template
index d9d1cce8877..35c1bad006f 100644
--- a/srcpkgs/notify-python/template
+++ b/srcpkgs/notify-python/template
@@ -1,7 +1,7 @@
# Template file for 'notify-python'
pkgname=notify-python
version=0.1.1
-revision=2
+revision=3
distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu_configure
short_desc="Python bindings for libnotify"
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 98d32846cad..83094eb8c8f 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,6 +1,7 @@
# Template file for 'orage'
pkgname=orage
version=4.8.1
+revision=1
distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
build_style=gnu_configure
short_desc="Simple calendar application for Xfce"
diff --git a/srcpkgs/pango/gir-pango.template b/srcpkgs/pango/gir-pango.template
deleted file mode 100644
index 290b108d30d..00000000000
--- a/srcpkgs/pango/gir-pango.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-pango'.
-#
-short_desc="Pango introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of Pango in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run pango
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index ae8caf966ed..3b2a5de9dbe 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,12 +1,12 @@
# Template build file for 'pango'.
pkgname=pango
-version=1.28.3
+version=1.28.4
distfiles="${GNOME_SITE}/pango/1.28/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Library for layout and rendering of text"
maintainer="Juan RP "
-checksum=5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632
+checksum=7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
long_desc="
Pango is a library for layout and rendering of text, with an emphasis
on internationalization. Pango can be used anywhere that text layout
@@ -29,7 +29,7 @@ long_desc="
PangoLayout, a high level driver for laying out entire blocks of text,
and routines to assist in editing internationalized text."
-subpackages="gir-pango pango-devel"
+subpackages="pango-devel"
triggers="pango-modules"
Add_dependency run glibc
diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template
index bc125169000..fbd035e737f 100644
--- a/srcpkgs/pangomm/template
+++ b/srcpkgs/pangomm/template
@@ -1,11 +1,11 @@
# Template build file for 'pangomm'.
pkgname=pangomm
-version=2.26.3
-distfiles="${GNOME_SITE}/pangomm/2.26/$pkgname-$version.tar.bz2"
+version=2.28.2
+distfiles="${GNOME_SITE}/pangomm/2.28/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="C++ bindings for the pango library"
maintainer="Juan RP "
-checksum=b1aa7a1de1c3eaf149ec0ca4bc962b8bf454f4e484abf34333d387d32c3825e6
+checksum=ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f
long_desc="
pangomm (used to be part of gtkmm) is the official C++ interface for the
popular GUI library GTK+. Highlights include typesafe callbacks, widgets
diff --git a/srcpkgs/papyon/template b/srcpkgs/papyon/template
new file mode 100644
index 00000000000..4319b95e526
--- /dev/null
+++ b/srcpkgs/papyon/template
@@ -0,0 +1,33 @@
+# Template file for 'papyon'
+pkgname=papyon
+version=0.5.4
+distfiles="http://www.freedesktop.org/software/papyon/releases/papyon-${version}.tar.gz"
+build_style=python-module
+short_desc="MSN library purely written in Python"
+maintainer="Juan RP "
+checksum=600ecb2480c4fca0efa7aa6df8665e75fdf7b7d38fa3ae23214436eb057e8ff3
+long_desc="
+ Features
+ - MSNP15
+ - Best MSNP2P implementation : avatars and custom emoticons
+ - Yahoo messenger contacts support : chat and presence
+ - Live Address Book support : full contact and group management
+ - Server side contacts aliasing
+ - Offline messages support
+ - MSN Spaces
+ - Content Roaming support : avatar, display name and personal message storage
+ - Full support for HTTP and HTTPS proxies
+ - Support HTTP Polling transport
+ - No threads, fully asynchronous
+ - Caching system (only used for storing the SSO tickets for now, but will be
+ used to support deltas in the AddressBook later)
+ - Very solid and extensible architecture
+ - Solid networking through a new sublibrary : gnet"
+
+noarch=yes
+Add_dependency full python
+Add_dependency full pygobject
+Add_dependency full pyopenssl
+Add_dependency full pycrypto
+Add_dependency full gst-python
+Add_dependency full farsight2
diff --git a/srcpkgs/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop b/srcpkgs/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop
new file mode 100644
index 00000000000..1c128ca335f
--- /dev/null
+++ b/srcpkgs/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop
@@ -0,0 +1,87 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўтэнтыфікацыі
+Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Πράκτορας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit 認証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Name[lt]=PolicyKit tapatybės nustatymo agentas
+Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ്
+Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங்கீகார முகவர்
+Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=Агент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认证代理
+Name[zh_HK]=PolicyKit 驗證代理程式
+Name[zh_TW]=PolicyKit 驗證代理程式
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
+Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Πράκτορας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit 認証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Comment[lt]=PolicyKit tapatybės nustatymo agentas
+Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ്
+Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங்கீகார முகவர்
+Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=Агент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认证代理
+Comment[zh_HK]=PolicyKit 驗證代理程式
+Comment[zh_TW]=PolicyKit 驗證代理程式
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=GNOME;
diff --git a/srcpkgs/polkit-gnome/gir-polkit-gnome.template b/srcpkgs/polkit-gnome/gir-polkit-gnome.template
deleted file mode 100644
index ef2a8fd8498..00000000000
--- a/srcpkgs/polkit-gnome/gir-polkit-gnome.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-polkit-gnome'.
-#
-short_desc="Introspection data for GNOME's PolicyKit"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- PolicyKit library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/polkit-gnome/polkit-gnome-devel.template b/srcpkgs/polkit-gnome/polkit-gnome-devel.template
index 5f56047e24d..89e0185e1e9 100644
--- a/srcpkgs/polkit-gnome/polkit-gnome-devel.template
+++ b/srcpkgs/polkit-gnome/polkit-gnome-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 intltool
Add_dependency run polkit-devel
@@ -16,12 +14,13 @@ Add_dependency run pango-devel
Add_dependency run cairo-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
-Add_dependency run gtk+-devel
+Add_dependency run gtk+3-devel
do_install()
{
mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index 19fd0251563..5bce1942f81 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,12 +1,12 @@
# Template file for 'polkit-gnome'
pkgname=polkit-gnome
-version=0.99
+version=0.101
distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--localstatedir=/var"
+configure_args="--localstatedir=/var --with-gtk=3.0"
short_desc="PolicyKit integration for the GNOME desktop"
maintainer="Juan RP "
-checksum=73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
+checksum=f1452e37b6681a0ade2c0cbb3734e6f78c421b958ab4d4eb6a2cd3b9f50db8d0
long_desc="
PolicyKit is an application-level toolkit for defining and handling the
policy that allows unprivileged processes to speak to privileged processes.
@@ -17,7 +17,7 @@ long_desc="
This package contains the glue to integrate with the GNOME desktop."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run polkit
@@ -29,7 +29,7 @@ Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run gdk-pixbuf
Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run gtk+3
Add_dependency build pkg-config
Add_dependency build intltool
@@ -42,5 +42,16 @@ Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build gobject-introspection
+
+post_install()
+{
+ # Disabled for now, will check later.
+ :
+ # Start polkit-gnome-authentication-agent-1 via XDG autostart,
+ # otherwise it will run with the GDM user and won't work.
+ #install -D -m644 \
+ # ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop \
+ # ${DESTDIR}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+}
diff --git a/srcpkgs/polkit/gir-polkit.template b/srcpkgs/polkit/gir-polkit.template
deleted file mode 100644
index d355ee7b88e..00000000000
--- a/srcpkgs/polkit/gir-polkit.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-polkit'.
-#
-short_desc="PolicyKit introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of PolicyKit in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run polkit
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 49e2963fd8d..4c575cd9453 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,13 +1,12 @@
# Template file for 'polkit'
pkgname=polkit
-version=0.99
-revision=1
+version=0.101
distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
build_style=gnu_configure
configure_args="--disable-static --localstatedir=/var --with-os-type=gentoo"
short_desc="Authorization Toolkit"
maintainer="Juan RP "
-checksum=f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
+checksum=927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b
long_desc="
PolicyKit is an application-level toolkit for defining and handling the
policy that allows unprivileged processes to speak to privileged processes.
@@ -17,7 +16,7 @@ long_desc="
method) for unprivileged (desktop) applications."
replaces="PolicyKit>=0"
-subpackages="gir-polkit polkit-devel"
+subpackages="polkit-devel"
Add_dependency run glib
Add_dependency run glibc
Add_dependency run expat
diff --git a/srcpkgs/pygobject/depends b/srcpkgs/pygobject/depends
index e93edc3bb2a..a64e647ded2 100644
--- a/srcpkgs/pygobject/depends
+++ b/srcpkgs/pygobject/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.20.0"
+abi_depends=">=2.27.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/pygobject/pygobject-devel.template b/srcpkgs/pygobject/pygobject-devel.template
index f794b56219a..be3455ef717 100644
--- a/srcpkgs/pygobject/pygobject-devel.template
+++ b/srcpkgs/pygobject/pygobject-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 libffi-devel
Add_dependency run glib-devel
Add_dependency run libgirepository-devel
diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template
index bcb4ec4dcf0..33e733bcbba 100644
--- a/srcpkgs/pygobject/template
+++ b/srcpkgs/pygobject/template
@@ -1,12 +1,11 @@
# Template file for 'pygobject'
pkgname=pygobject
-version=2.26.0
-revision=2
-distfiles="${GNOME_SITE}/$pkgname/2.26/$pkgname-$version.tar.bz2"
+version=2.28.3
+distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Python bindings for GObject"
maintainer="Juan RP "
-checksum=5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7
+checksum=7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6
long_desc="
Pygobject is a set of Python bindings for the GLib's GObject library."
diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index fe660028362..4de4bba9cb7 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,11 +1,11 @@
# Template file for 'rtkit'
pkgname=rtkit
-version=0.9
+version=0.10
distfiles="http://0pointer.de/public/$pkgname-$version.tar.gz"
build_style=gnu_configure
short_desc="Realtime Policy and Watchdog Daemon"
maintainer="Juan RP "
-checksum=5236ab2db3a1e6d34d0fcb11572b769a8989ba47b3cb282659f9315ed9143921
+checksum=74ea93ac09d9d5a7cb85bf57ec92090311c9fb105a41bdd633adcf3b94472120
long_desc="
RealtimeKit is a D-Bus system service that changes the scheduling policy of
user processes/threads to SCHED_RR (i.e. realtime scheduling mode) on request.
diff --git a/srcpkgs/seahorse/gir-seahorse.template b/srcpkgs/seahorse/gir-seahorse.template
deleted file mode 100644
index d5a13f408b9..00000000000
--- a/srcpkgs/seahorse/gir-seahorse.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-seahorse'.
-#
-short_desc="Introspection data for GNOME's seahorse"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the GNOME's
- seahorse library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index fe54d345706..53a74c77aa8 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,14 +1,14 @@
# Template file for 'seahorse'
pkgname=seahorse
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.93
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--localstatedir=/var --disable-scrollkeeper
+configure_args="--localstatedir=/var --disable-scrollkeeper --with-gtk=3.0
--disable-update-mime-database --enable-ldap --enable-hkp --enable-libnotify
--disable-schemas-install --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
short_desc="Encryption Made Easy"
maintainer="Juan RP "
-checksum=f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
+checksum=ac67e077249062e38b5239616a1f02d96b2484045d2964cb2ce6972e9e0d2ae4
long_desc="
Seahorse is a GNOME application for managing encryption keys. It also
integrates with nautilus, gedit and other places for encryption operations.
@@ -24,55 +24,61 @@ long_desc="
gtk_iconcache_dirs="/usr/share/icons/hicolor"
gconf_schemas="$pkgname.schemas"
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
-Add_dependency run gpgme
-Add_dependency run libldap
-Add_dependency run avahi-libs
-Add_dependency run avahi-glib-libs
-Add_dependency run atk
Add_dependency run glib
-Add_dependency run gdk-pixbuf
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
+Add_dependency run gtk+3
+Add_dependency run atk
Add_dependency run pango
-Add_dependency run cairo
+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+
-Add_dependency run libnotify
-Add_dependency run libsoup
Add_dependency run GConf
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run gpgme
+Add_dependency run libldap
+Add_dependency run libsoup
Add_dependency run libgnome-keyring
+Add_dependency run avahi-libs
+Add_dependency run avahi-glib-libs
Add_dependency run gnome-keyring
+Add_dependency run libnotify
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
+Add_dependency build glib-devel
+Add_dependency build gtk+3-devel
+Add_dependency build atk-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 GConf-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
Add_dependency build gpgme-devel
Add_dependency build libldap-devel
Add_dependency build libsoup-devel
Add_dependency build libgnome-keyring-devel
Add_dependency build avahi-libs-devel
Add_dependency build avahi-glib-libs-devel
-Add_dependency build glibc-devel
Add_dependency build gnome-keyring-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build gdk-pixbuf-devel
Add_dependency build libnotify-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
Add_dependency full openssh-client
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
+
+post_install()
+{
+ mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+ gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+ --domain ${pkgname} ${wrksrc}/*.schemas
+}
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 93f273c1ce9..9f85b23fbef 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,12 +1,12 @@
# Template file for 'squashfs-tools'
pkgname=squashfs-tools
-version=4.1
+version=4.2
wrksrc="squashfs${version}"
distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz"
build_style=custom-install
short_desc="Tool to create and append to squashfs filesystems"
maintainer="Juan RP "
-checksum=3a870d065a25b3f5467bc6d9ed34340befab51a3f9e4b7e3792ea0ff4e06046a
+checksum=d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
long_desc="
Squashfs is a highly compressed read-only filesystem for Linux. It uses zlib
compression to compress both files, inodes and directories. Inodes in the
@@ -29,19 +29,16 @@ Add_dependency build liblzma-devel
do_build()
{
- cd ${wrksrc}/${pkgname} || return 1
-
+ cd ${wrksrc}/${pkgname}
# Enable LZO and XZ support.
sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
-
- make ${makejobs} || return 1
+ make ${makejobs}
}
do_install()
{
- cd ${wrksrc}/${pkgname} || return 1
-
+ cd ${wrksrc}/${pkgname}
install -d ${DESTDIR}/usr/bin
install -m755 {mk,un}squashfs ${DESTDIR}/usr/bin
}
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index d3bff130d07..00f889a2824 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,11 +1,11 @@
# Template build file for 'tar'.
pkgname=tar
-version=1.25
+version=1.26
distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="The GNU tape archiver with remote magnetic tape support"
maintainer="Juan RP "
-checksum=f3f6ce41b8e0f327abd05c95990f113ddafbae131e10f79a99728ed46458494b
+checksum=5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41
long_desc="
GNU tar, originally shipped as NetBSD's \"tar\" up to version 1.3, is a
full-featured tar command that can access remote and local magnetic tapes,
diff --git a/srcpkgs/telepathy-butterfly/patches/0001-bugfix-remove-bad-import-from-im-module.patch b/srcpkgs/telepathy-butterfly/patches/0001-bugfix-remove-bad-import-from-im-module.patch
new file mode 100644
index 00000000000..62f7bd84774
--- /dev/null
+++ b/srcpkgs/telepathy-butterfly/patches/0001-bugfix-remove-bad-import-from-im-module.patch
@@ -0,0 +1,26 @@
+From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
+From: Ionut Biru
+Date: Mon, 6 Dec 2010 04:22:45 -0800
+Subject: [PATCH] bugfix: remove bad import from im module
+
+Signed-off-by: Ionut Biru
+---
+ butterfly/channel/im.py | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
+index 1781234..ac8dd44 100644
+--- butterfly/channel/im.py
++++ butterfly/channel/im.py
+@@ -30,8 +30,6 @@ import papyon.event
+
+ from butterfly.channel.text import ButterflyTextChannel
+
+-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE
+-
+ __all__ = ['ButterflyImChannel']
+
+ logger = logging.getLogger('Butterfly.ImChannel')
+--
+1.7.3.2
+
diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template
new file mode 100644
index 00000000000..14bb6441c3c
--- /dev/null
+++ b/srcpkgs/telepathy-butterfly/template
@@ -0,0 +1,18 @@
+# Template file for 'telepathy-butterfly'
+pkgname=telepathy-butterfly
+version=0.5.15
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="A MSN connection manager for Telepathy"
+maintainer="Juan RP "
+checksum=d48eef7f938c2b5bb805dd6bbbcde673b1c6526ca15af6b5f8fe03d926d35b90
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+noarch=yes
+Add_dependency full python
+Add_dependency full papyon
+Add_dependency full telepathy-python
diff --git a/srcpkgs/telepathy-farsight-devel b/srcpkgs/telepathy-farsight-devel
new file mode 120000
index 00000000000..47255cabe61
--- /dev/null
+++ b/srcpkgs/telepathy-farsight-devel
@@ -0,0 +1 @@
+telepathy-farsight
\ No newline at end of file
diff --git a/srcpkgs/telepathy-farsight/depends b/srcpkgs/telepathy-farsight/depends
new file mode 100644
index 00000000000..eef6a55757d
--- /dev/null
+++ b/srcpkgs/telepathy-farsight/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.0.16"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/telepathy-farsight/telepathy-farsight-devel.template b/srcpkgs/telepathy-farsight/telepathy-farsight-devel.template
new file mode 100644
index 00000000000..c7ff112d479
--- /dev/null
+++ b/srcpkgs/telepathy-farsight/telepathy-farsight-devel.template
@@ -0,0 +1,26 @@
+# Template file for 'telepathy-farsight-devel'.
+#
+short_desc="${short_desc} - 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 libxslt
+Add_dependency run glib-devel
+Add_dependency run python-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libxml2-devel
+Add_dependency run gstreamer-devel
+Add_dependency run telepathy-glib-devel
+Add_dependency run farsight2-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/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/telepathy-farsight/template b/srcpkgs/telepathy-farsight/template
new file mode 100644
index 00000000000..3e9bf2c19ec
--- /dev/null
+++ b/srcpkgs/telepathy-farsight/template
@@ -0,0 +1,37 @@
+# Template file for 'telepathy-farsight'
+pkgname=telepathy-farsight
+version=0.0.16
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-static"
+short_desc="A telepathy-backend to handle media streaming channels"
+maintainer="Juan RP "
+checksum=b8dfde94061be6d31accc27d37a38eee4f543dc954fe30671cf8215a27edd9be
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run python
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libxml2
+Add_dependency run gstreamer
+Add_dependency run telepathy-glib
+Add_dependency run farsight2
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build libxslt
+Add_dependency build glib-devel
+Add_dependency build python-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build gstreamer-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build farsight2-devel
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
new file mode 100644
index 00000000000..1d5054f8419
--- /dev/null
+++ b/srcpkgs/telepathy-gabble/template
@@ -0,0 +1,37 @@
+# Template file for 'telepathy-gabble'
+pkgname=telepathy-gabble
+version=0.11.7
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--without-ca-certificates --enable-handle-leak-debug"
+short_desc="A Jabber/XMPP connection manager for Telepathy"
+maintainer="Juan RP "
+checksum=bd49a50d3715f2b9f9620e30d82e050f74484108e9367eaf8c048f2c5546949f
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libxml2
+Add_dependency run sqlite
+Add_dependency run gnutls
+Add_dependency run telepathy-glib
+Add_dependency run libsoup
+Add_dependency run libnice
+
+Add_dependency build python
+Add_dependency build pkg-config
+Add_dependency build glib-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 gnutls-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build libsoup-devel
+Add_dependency build libnice-devel
diff --git a/srcpkgs/telepathy-glib-devel b/srcpkgs/telepathy-glib-devel
new file mode 120000
index 00000000000..5d4a840a720
--- /dev/null
+++ b/srcpkgs/telepathy-glib-devel
@@ -0,0 +1 @@
+telepathy-glib
\ No newline at end of file
diff --git a/srcpkgs/telepathy-glib/depends b/srcpkgs/telepathy-glib/depends
new file mode 100644
index 00000000000..54069400c4c
--- /dev/null
+++ b/srcpkgs/telepathy-glib/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.13.15"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/telepathy-glib/telepathy-glib-devel.template b/srcpkgs/telepathy-glib/telepathy-glib-devel.template
new file mode 100644
index 00000000000..156b8e9a70d
--- /dev/null
+++ b/srcpkgs/telepathy-glib/telepathy-glib-devel.template
@@ -0,0 +1,24 @@
+# Template file for 'gjs-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 vala-devel
+Add_dependency run gobject-introspection
+Add_dependency run glib-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/{lib,share}
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/share/{gir-1.0,gtk-doc,vala} \
+ ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
new file mode 100644
index 00000000000..72c92163744
--- /dev/null
+++ b/srcpkgs/telepathy-glib/template
@@ -0,0 +1,28 @@
+# Template file for 'telepathy-glib'
+pkgname=telepathy-glib
+version=0.14.1
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-vala-bindings"
+short_desc="Library for GLib-based Telepathy components"
+maintainer="Juan RP "
+checksum=27f67e61b87bdb831d0c76ab8fc2385c780ff10ae89b2f4db49417fc516f8be0
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build vala-devel
+Add_dependency build gobject-introspection
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
new file mode 100644
index 00000000000..594261f0401
--- /dev/null
+++ b/srcpkgs/telepathy-idle/template
@@ -0,0 +1,27 @@
+# Template file for 'telepathy-idle'
+pkgname=telepathy-idle
+version=0.1.8
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="An IRC connection manager for Telepathy"
+maintainer="Juan RP "
+checksum=384119cc64022626b6f51aaaef605abf248602d8fae25baff82762a097f20fe9
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libssl
+Add_dependency run dbus-glib
+Add_dependency run telepathy-glib
+
+Add_dependency build pkg-config
+Add_dependency build python
+Add_dependency build libxslt
+Add_dependency build glib-devel
+Add_dependency build openssl-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build telepathy-glib-devel
diff --git a/srcpkgs/telepathy-logger-devel b/srcpkgs/telepathy-logger-devel
new file mode 120000
index 00000000000..d7fe356fb1f
--- /dev/null
+++ b/srcpkgs/telepathy-logger-devel
@@ -0,0 +1 @@
+telepathy-logger
\ No newline at end of file
diff --git a/srcpkgs/telepathy-logger/depends b/srcpkgs/telepathy-logger/depends
new file mode 100644
index 00000000000..b83f9c6c6d4
--- /dev/null
+++ b/srcpkgs/telepathy-logger/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.2.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/telepathy-logger/telepathy-logger-devel.template b/srcpkgs/telepathy-logger/telepathy-logger-devel.template
new file mode 100644
index 00000000000..db6c651b2dd
--- /dev/null
+++ b/srcpkgs/telepathy-logger/telepathy-logger-devel.template
@@ -0,0 +1,25 @@
+# Template file for 'telepathy-logger-devel'.
+#
+short_desc="${short_desc} - 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 gobject-introspection
+Add_dependency run glib-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 telepathy-glib-devel
+Add_dependency run telepathy-logger
+
+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
+}
diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
new file mode 100644
index 00000000000..20fc8e34d6d
--- /dev/null
+++ b/srcpkgs/telepathy-logger/template
@@ -0,0 +1,35 @@
+# Template file for 'telepathy-logger'
+pkgname=telepathy-logger
+version=0.2.4
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-static --disable-schemas-compile"
+short_desc="Telepathy framework logging daemon"
+maintainer="Juan RP "
+checksum=f1fc53dbd8a6916057e109f788fea0a3777e8423d33baf60cb4e6fe51fc8d70c
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+triggers="gsettings-schemas"
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libxml2
+Add_dependency run sqlite
+Add_dependency run telepathy-glib
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gobject-introspection
+Add_dependency build glib-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 telepathy-glib-devel
diff --git a/srcpkgs/telepathy-mission-control-devel b/srcpkgs/telepathy-mission-control-devel
new file mode 120000
index 00000000000..fd8ee070dc1
--- /dev/null
+++ b/srcpkgs/telepathy-mission-control-devel
@@ -0,0 +1 @@
+telepathy-mission-control
\ No newline at end of file
diff --git a/srcpkgs/telepathy-mission-control/depends b/srcpkgs/telepathy-mission-control/depends
new file mode 100644
index 00000000000..d86ed2c26c2
--- /dev/null
+++ b/srcpkgs/telepathy-mission-control/depends
@@ -0,0 +1,2 @@
+abi_depends=">=5.7.5"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template b/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
new file mode 100644
index 00000000000..66621ec923c
--- /dev/null
+++ b/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
@@ -0,0 +1,22 @@
+# Template file for 'telepathy-mission-control-devel'.
+#
+short_desc="${short_desc} - 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 dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libgnome-keyring-devel
+Add_dependency run telepathy-glib-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/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
new file mode 100644
index 00000000000..16cf28de990
--- /dev/null
+++ b/srcpkgs/telepathy-mission-control/template
@@ -0,0 +1,30 @@
+# Template file for 'telepathy-mission-control'
+pkgname=telepathy-mission-control
+version=5.7.5
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-static --enable-gnome-keyring"
+short_desc=" Telepathy component providing abstraction for details of connection managers"
+maintainer="Juan RP "
+checksum=ca39fff8acd1b1c475a92db628e68fd985910015942439863152a1da61dfe576
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libgnome-keyring
+Add_dependency run telepathy-glib
+
+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 libgnome-keyring-devel
+Add_dependency build telepathy-glib-devel
diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template
new file mode 100644
index 00000000000..ca656d0e7aa
--- /dev/null
+++ b/srcpkgs/telepathy-python/template
@@ -0,0 +1,18 @@
+# Template file for 'telepathy-python'
+pkgname=telepathy-python
+version=0.15.19
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Python libraries for use in Telepathy clients and connection managers"
+maintainer="Juan RP "
+checksum=244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376
+long_desc="
+ Telepathy is a D-Bus framework for unifying real time communication,
+ including instant messaging, voice calls and video calls. It abstracts
+ differences between protocols to provide a unified interface for
+ applications."
+
+noarch=yes
+Add_dependency build libxslt
+Add_dependency full python
+Add_dependency full dbus-python
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index c61c91409bc..89bde1a6072 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,6 +1,7 @@
# Template file for 'thunar-volman'.
pkgname=thunar-volman
version=0.6.0
+revision=1
distfiles="http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Thunar Volume Manager"
diff --git a/srcpkgs/totem-devel b/srcpkgs/totem-devel
new file mode 120000
index 00000000000..f252041718a
--- /dev/null
+++ b/srcpkgs/totem-devel
@@ -0,0 +1 @@
+totem
\ No newline at end of file
diff --git a/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template b/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template
deleted file mode 100644
index 40534b1bdcf..00000000000
--- a/srcpkgs/totem-pl-parser/gir-totem-pl-parser.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-totem-pl-parser'.
-#
-short_desc="Introspection data for Totem Playlist Parser"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- Totem Playlist Parser."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index fbaec1fc7c1..6184a1bcbb2 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -1,17 +1,17 @@
# Template file for 'totem-pl-parser'
pkgname=totem-pl-parser
-version=2.32.3
+version=2.32.4
distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Totem playlist parser library"
maintainer="Juan RP "
-checksum=c15149650c5420426e7becd6eb4298e898d1975cb7c9ff534cc0785d350916e2
+checksum=349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6
long_desc="
$pkgname is a simple GObject-based library to parse a host of
playlist formats, as well as save those."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run glibc
Add_dependency run glib
diff --git a/srcpkgs/totem/depends b/srcpkgs/totem/depends
new file mode 100644
index 00000000000..13ec5d9828f
--- /dev/null
+++ b/srcpkgs/totem/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.91.7"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 3866cd9bf2a..3607ec6f789 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,15 +1,13 @@
# Template file for 'totem'
pkgname=totem
-version=2.32.0
-revision=2
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var --disable-static"
+configure_args="--disable-scrollkeeper --localstatedir=/var --disable-static
+--disable-schemas-compile"
short_desc="A GNOME2 integrated movie player based on Gstreamer."
maintainer="Juan RP "
-checksum=982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
+checksum=cfcd884d73ee7ac7a2ffd1c1191314d76fa738494621985ab865c47002cb481d
long_desc="
Totem is a simple yet featureful media player for GNOME which can read
a large number of file formats. It features :
@@ -33,55 +31,50 @@ long_desc="
* DVD, VCD and OGG/OGM subtitles with automatic language selection
* Extensible with plugins"
-subpackages="totem-mozilla-plugin"
-
+subpackages="totem-devel totem-mozilla-plugin"
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-gconf_schemas="
-totem-video-thumbnail.schemas
-totem-handlers.schemas
-totem.schemas"
Add_dependency run libgcc
Add_dependency run glibc
Add_dependency run libstdc++
-Add_dependency run gst-plugins-base
-Add_dependency run gtk+
-Add_dependency run atk
-Add_dependency run gdk-pixbuf
-Add_dependency run GConf
Add_dependency run glib
-Add_dependency run gstreamer
-Add_dependency run cairo
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libbluetooth
+Add_dependency run libffi
+Add_dependency run libgirepository
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
Add_dependency run libXrandr
Add_dependency run libXxf86vm
-Add_dependency run dbus-glib
Add_dependency run libXtst
-Add_dependency run libX11
Add_dependency run libxml2
+Add_dependency run atk
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
Add_dependency run pango
Add_dependency run libpng
Add_dependency run freetype
Add_dependency run fontconfig
-Add_dependency run libgdata
+Add_dependency run gtk+3
+Add_dependency run libpeas
+Add_dependency run gstreamer
+Add_dependency run gst-plugins-base
Add_dependency run libsoup
-Add_dependency run dbus-libs
-Add_dependency run libbluetooth
-Add_dependency run nautilus
-Add_dependency run libunique
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run python
-Add_dependency run pygtk
+Add_dependency run evolution-data-server
Add_dependency run totem-pl-parser
+Add_dependency run nautilus
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
Add_dependency build gst-plugins-base-devel
-Add_dependency build gtk+-devel
+Add_dependency build gtk+3-devel
Add_dependency build atk-devel
Add_dependency build gdk-pixbuf-devel
-Add_dependency build GConf-devel
+Add_dependency build totem-pl-parser-devel
Add_dependency build glib-devel
Add_dependency build gstreamer-devel
Add_dependency build cairo-devel
@@ -91,21 +84,21 @@ Add_dependency build dbus-glib-devel
Add_dependency build libXtst-devel
Add_dependency build libX11-devel
Add_dependency build libxml2-devel
+Add_dependency build nautilus-devel
Add_dependency build pango-devel
Add_dependency build libpng-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
-Add_dependency build libgdata-devel
-Add_dependency build libsoup-devel
-Add_dependency build dbus-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build nautilus-devel
-Add_dependency build libunique-devel
+Add_dependency build libpeas-devel
+Add_dependency build libgirepository-devel
+Add_dependency build libffi-devel
Add_dependency build libSM-devel
Add_dependency build libICE-devel
-Add_dependency build python-devel
-Add_dependency build pygtk-devel
-Add_dependency build totem-pl-parser-devel
+Add_dependency build libbluetooth-devel
+Add_dependency build dbus-devel
+Add_dependency build evolution-data-server-devel
+Add_dependency build libsoup-devel
+Add_dependency build brasero-devel
Add_dependency full gst-ffmpeg
Add_dependency full gst-plugins-bad
diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template
new file mode 100644
index 00000000000..5ef47941c08
--- /dev/null
+++ b/srcpkgs/totem/totem-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'totem-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
+
+}
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 1b2b7e44015..94aadf3926e 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,6 +1,7 @@
# Template file for 'transmission'
pkgname=transmission
version=2.21
+revision=1
distfiles="http://download.transmissionbt.com/files/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-gtk --enable-libnotify --enable-nls --enable-cli
@@ -17,40 +18,30 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
Add_dependency run zlib
-Add_dependency run libnotify
-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 gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run dbus-libs
-Add_dependency run dbus-glib
Add_dependency run libssl
+Add_dependency run glib
+Add_dependency run dbus-glib
Add_dependency run libcurl
Add_dependency run libevent
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+
+Add_dependency run libnotify
Add_dependency run libcanberra
Add_dependency run GConf
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build libnotify-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 glibc-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
Add_dependency build zlib-devel
+Add_dependency build openssl-devel
+Add_dependency build glib-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libcurl-devel
Add_dependency build libevent-devel
+Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+-devel
+Add_dependency build libnotify-devel
Add_dependency build libcanberra-devel
Add_dependency build GConf-devel
diff --git a/srcpkgs/udev/gir-gudev.template b/srcpkgs/udev/gir-gudev.template
deleted file mode 100644
index 7a62a04f8e4..00000000000
--- a/srcpkgs/udev/gir-gudev.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-gudev'.
-#
-short_desc="libgudev introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of libgudev in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run libgudev
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/udev/libgudev.template b/srcpkgs/udev/libgudev.template
index fd79e7233f4..0f04ba50ea6 100644
--- a/srcpkgs/udev/libgudev.template
+++ b/srcpkgs/udev/libgudev.template
@@ -6,6 +6,7 @@ long_desc="${long_desc}
This package contains libgudev, a library to interact with udev through
the GLib bindings."
+revision=1
replaces="udev-glib>=0"
Add_dependency run glibc
Add_dependency run glib
@@ -13,6 +14,7 @@ Add_dependency run libudev
do_install()
{
- mkdir -p ${DESTDIR}/lib
+ mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/lib/libgudev* ${DESTDIR}/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index 21dec3e475c..d0caca99087 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -15,7 +15,7 @@ long_desc="
keep_empty_dirs=yes
openrc_services="udev sysinit true"
conf_files="/etc/udev/udev.conf"
-subpackages="gir-gudev libudev libudev-devel libgudev libgudev-devel"
+subpackages="libudev libudev-devel libgudev libgudev-devel"
triggers="initramfs-tools"
Add_dependency run glibc
diff --git a/srcpkgs/upower/gir-upower.template b/srcpkgs/upower/gir-upower.template
deleted file mode 100644
index 495d14a24d8..00000000000
--- a/srcpkgs/upower/gir-upower.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gir-upower'.
-#
-short_desc="UPower introspection data"
-long_desc="${long_desc}
-
- This package contains the GObject-introspection data of UPower in
- binary typelib format."
-
-Add_dependency run gir-freedesktop
-Add_dependency run glib
-Add_dependency run upower
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index c84dad8ad80..1393fba8eaf 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,6 +1,7 @@
# Template file for 'upower'
pkgname=upower
version=0.9.8
+revision=1
distfiles="http://upower.freedesktop.org/releases/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --with-backend=linux"
@@ -15,7 +16,7 @@ long_desc="
using PolicyKit."
conf_files="/etc/UPower/UPower.conf"
-subpackages="upower-devel gir-upower"
+subpackages="upower-devel"
Add_dependency run glibc
Add_dependency run libusb
diff --git a/srcpkgs/vala/depends b/srcpkgs/vala/depends
index 988314e5383..b2827314d7a 100644
--- a/srcpkgs/vala/depends
+++ b/srcpkgs/vala/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.10.1<0.11"
+abi_depends=">=0.11"
api_depends="${abi_depends}"
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 21adc88dcd9..7a4f3bdbdf8 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,12 +1,12 @@
# Template file for 'vala'
pkgname=vala
-version=0.10.1
-distfiles="http://download.gnome.org/sources/vala/0.10/vala-$version.tar.bz2"
+version=0.12.0
+distfiles="http://download.gnome.org/sources/vala/0.12/vala-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-vapigen"
short_desc="Compiler for the GObject type system"
maintainer="Juan RP "
-checksum=eae1d2f52b651e9d2ed31ae0877ab671b5f796a3013c714f86a926806337805a
+checksum=9a398e16fba2c78c9bcadb05e489c9bc318e34901d43451ac5d2ce4bc46b1225
long_desc="
Vala is a new programming language that aims to bring modern programming
language features to GNOME developers without imposing any additional runtime
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
new file mode 100644
index 00000000000..a6b9838b789
--- /dev/null
+++ b/srcpkgs/vino/template
@@ -0,0 +1,63 @@
+# Template file for 'vino'
+pkgname=vino
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-schemas-compile"
+short_desc="VNC server for the GNOME desktop"
+maintainer="Juan RP "
+checksum=15d511bc63a63f63b3bb182a9c7f48dd2d7c619fdb4305379d1018c5211314aa
+long_desc="
+ The package contains an integrated VNC server for GNOME."
+
+triggers="gsettings-schemas"
+
+Add_dependency run glibc
+Add_dependency run gtk+3
+Add_dependency run cairo
+Add_dependency run libnotify
+Add_dependency run glib
+Add_dependency run libgnome-keyring
+Add_dependency run avahi-libs
+Add_dependency run avahi-glib-libs
+Add_dependency run gnutls
+Add_dependency run libgcrypt
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
+Add_dependency run libXtst
+Add_dependency run libXext
+Add_dependency run libXdamage
+Add_dependency run libXfixes
+Add_dependency run telepathy-glib
+Add_dependency run jpeg
+Add_dependency run zlib
+Add_dependency run dbus-glib
+Add_dependency run libsoup
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build gtk+3-devel
+Add_dependency build cairo-devel
+Add_dependency build libnotify-devel
+Add_dependency build glib-devel
+Add_dependency build libgnome-keyring-devel
+Add_dependency build avahi-libs-devel
+Add_dependency build avahi-glib-libs-devel
+Add_dependency build gnutls-devel
+Add_dependency build libgcrypt-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libX11-devel
+Add_dependency build libXtst-devel
+Add_dependency build libXext-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXfixes-devel
+Add_dependency build telepathy-glib-devel
+Add_dependency build jpeg-devel
+Add_dependency build zlib-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libsoup-devel
+
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch b/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch
new file mode 100644
index 00000000000..93b62d85131
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch
@@ -0,0 +1,11 @@
+--- modules/misc/notify/notify.c.orig 2011-02-28 23:54:18.794722978 +0100
++++ modules/misc/notify/notify.c 2011-02-28 23:54:49.425738093 +0100
+@@ -312,7 +312,7 @@ static int Notify( vlc_object_t *p_this,
+ }
+
+ notification = notify_notification_new( _("Now Playing"),
+- psz_temp, NULL, NULL );
++ psz_temp, NULL );
+ notify_notification_set_timeout( notification,
+ var_InheritInteger(p_this, "notify-timeout") );
+ notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 462848cfc94..b2cb000db53 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=1.1.7
-revision=1
+revision=3
distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
build_style=gnu_configure
configure_args="--disable-gme --disable-libtar --enable-snapshot
@@ -35,7 +35,6 @@ Add_dependency run libpng
Add_dependency run zlib
Add_dependency run SDL
Add_dependency run x264
-Add_dependency run ffmpeg
Add_dependency run libXxf86vm
Add_dependency run libXinerama
Add_dependency run libSM
@@ -94,6 +93,11 @@ Add_dependency run libtheora
Add_dependency run libspeex
Add_dependency run libpulseaudio
Add_dependency run libsmbclient
+Add_dependency run libavformat
+Add_dependency run libavcodec
+Add_dependency run libavutil
+Add_dependency run libpostproc
+Add_dependency run libswscale
Add_dependency build pkg-config
Add_dependency build glibc-devel
@@ -174,11 +178,9 @@ Add_dependency full desktop-file-utils
pre_configure()
{
# hostname -s is not valid, at least in coreutils!
- sed -i "s|hostname -s|hostname|g" ${wrksrc}/configure || return 1
- # Use wc(1) from coreutils
- export PATH="/usr/bin:/bin:$PATH"
+ sed -i "s|hostname -s|hostname|g" configure
sed -i "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
- ${wrksrc}/modules/misc/freetype.c
+ modules/misc/freetype.c
}
post_install()
@@ -189,7 +191,7 @@ post_install()
rm -f ${DESTDIR}/usr/bin/vlc-config
rm -f ${DESTDIR}/usr/share/man/man1/vlc-config.1
- install -d ${DESTDIR}/usr/share/pixmaps || return 1
+ install -d ${DESTDIR}/usr/share/pixmaps
cd ${DESTDIR}/usr/share/pixmaps && \
- ln -sf ../vlc/vlc48x48.png vlc.png || return 1
+ ln -sf ../vlc/vlc48x48.png vlc.png
}
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
index 3bd988d98f0..ea4d41253cc 100644
--- a/srcpkgs/vte/template
+++ b/srcpkgs/vte/template
@@ -1,13 +1,12 @@
# Template build file for 'vte'.
pkgname=vte
-version=0.26.2
-revision=1
-distfiles="${GNOME_SITE}/vte/0.26/$pkgname-$version.tar.bz2"
+version=0.28.0
+distfiles="${GNOME_SITE}/vte/0.28/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Juan RP "
-checksum=f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd
+checksum=1467c566aa9e55c1e33aa1dfea3f14dd4c8a4a63ff0005b254bd8c2c375d952e
long_desc="
Terminal widget with improved font, internationalization and
accessibility support for the GNOME 2 desktop."
@@ -24,8 +23,8 @@ Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libpng
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
Add_dependency run libX11
+Add_dependency run gtk+
Add_dependency build pkg-config
Add_dependency build intltool
diff --git a/srcpkgs/vte/vte-devel.template b/srcpkgs/vte/vte-devel.template
index 80c5be5b821..c497504ec69 100644
--- a/srcpkgs/vte/vte-devel.template
+++ b/srcpkgs/vte/vte-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 intltool
Add_dependency run gtk+-devel
diff --git a/srcpkgs/vte/vte-python.template b/srcpkgs/vte/vte-python.template
index 5ea26dfa9e1..f432a298be6 100644
--- a/srcpkgs/vte/vte-python.template
+++ b/srcpkgs/vte/vte-python.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains the Python bindings."
-revision=1
-
Add_dependency run glibc
Add_dependency run ncurses-libs
Add_dependency run python
diff --git a/srcpkgs/vte3-devel b/srcpkgs/vte3-devel
new file mode 120000
index 00000000000..30ca3abb877
--- /dev/null
+++ b/srcpkgs/vte3-devel
@@ -0,0 +1 @@
+vte3
\ No newline at end of file
diff --git a/srcpkgs/vte3/depends b/srcpkgs/vte3/depends
new file mode 100644
index 00000000000..b2ba4f1866d
--- /dev/null
+++ b/srcpkgs/vte3/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.28.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
new file mode 100644
index 00000000000..f154c77a067
--- /dev/null
+++ b/srcpkgs/vte3/template
@@ -0,0 +1,44 @@
+# Template build file for 'vte3'.
+pkgname=vte3
+version=0.28.0
+wrksrc=vte-${version}
+distfiles="${GNOME_SITE}/vte/0.28/vte-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --with-gtk=3.0 --enable-introspection
+--disable-gnome-pty-helper"
+short_desc="Terminal widget with improved accessibility and I18N support"
+maintainer="Juan RP "
+checksum=1467c566aa9e55c1e33aa1dfea3f14dd4c8a4a63ff0005b254bd8c2c375d952e
+long_desc="
+ Terminal widget with improved font, internationalization and
+ accessibility support for the GNOME 3 desktop."
+
+subpackages="vte3-devel"
+
+Add_dependency run glibc
+Add_dependency run ncurses-libs
+Add_dependency run glib
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libpng
+Add_dependency run gdk-pixbuf
+Add_dependency run libX11
+Add_dependency run gtk+3
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gtk+3-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 libX11-devel
+Add_dependency build ncurses-devel
+Add_dependency build gobject-introspection
+
+Add_dependency full vte ">=0.0" # for gnome-pty-helper
diff --git a/srcpkgs/vte3/vte3-devel.template b/srcpkgs/vte3/vte3-devel.template
new file mode 100644
index 00000000000..0132012e077
--- /dev/null
+++ b/srcpkgs/vte3/vte3-devel.template
@@ -0,0 +1,28 @@
+# Template file for 'vte3-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 gtk+3-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 ncurses-devel
+Add_dependency run libX11-devel
+Add_dependency run vte3
+
+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*,gtk-doc} ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/webkit-gtk/gir-webkit-gtk.template b/srcpkgs/webkit-gtk/gir-webkit-gtk.template
deleted file mode 100644
index dcbce375e36..00000000000
--- a/srcpkgs/webkit-gtk/gir-webkit-gtk.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gir-webkit-gtk'.
-#
-short_desc="Introspection data for WebKit GTK+"
-long_desc="${long_desc}
-
- This package contains small pieces of introspection data for the
- WebKit GTK+ library."
-
-do_install()
-{
- install -d ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template
index e28f99626e3..6a3155970b8 100644
--- a/srcpkgs/webkit-gtk/template
+++ b/srcpkgs/webkit-gtk/template
@@ -1,6 +1,7 @@
# Template file for 'webkit-gtk'
pkgname=webkit-gtk
version=1.2.7
+revision=2
wrksrc=webkit-${version}
distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz"
build_style=gnu_configure
@@ -20,7 +21,7 @@ long_desc="
This is the GTK2+ port of the engine."
-subpackages="gir-$pkgname $pkgname-devel"
+subpackages="$pkgname-devel"
Add_dependency run libgcc
Add_dependency run glibc
diff --git a/srcpkgs/webkit-gtk3-devel b/srcpkgs/webkit-gtk3-devel
new file mode 120000
index 00000000000..bddb8d19782
--- /dev/null
+++ b/srcpkgs/webkit-gtk3-devel
@@ -0,0 +1 @@
+webkit-gtk3
\ No newline at end of file
diff --git a/srcpkgs/webkit-gtk3/depends b/srcpkgs/webkit-gtk3/depends
new file mode 100644
index 00000000000..e395e65cade
--- /dev/null
+++ b/srcpkgs/webkit-gtk3/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.3.12"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template
new file mode 100644
index 00000000000..fc91b44dd74
--- /dev/null
+++ b/srcpkgs/webkit-gtk3/template
@@ -0,0 +1,76 @@
+# Template file for 'webkit-gtk3'
+pkgname=webkit-gtk3
+version=1.3.13
+wrksrc=webkit-${version}
+distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-video --with-gtk=3.0 --enable-jit
+--enable-3d-transforms --with-font-backend=freetype --enable-introspection
+--with-unicode-backend=icu --disable-schemas-compile"
+short_desc="GTK+3 port of the WebKit browser engine"
+maintainer="Juan RP "
+checksum=a35e8b69c9acb94c4d5d4bdd5b92ae3d3255b7f60ed785ac7cdf325a15197f89
+long_desc="
+ WebKit is an open source web browser engine. WebKit is also the name of
+ the Mac OS X system framework version of the engine that's used by
+ Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML
+ and JavaScript code began as a branch of the KHTML and KJS libraries
+ from KDE.
+
+ This is the GTK3+ port of the engine."
+
+triggers="gsettings-schemas"
+subpackages="$pkgname-devel"
+
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run glib
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run jpeg
+Add_dependency run libxslt
+Add_dependency run zlib
+Add_dependency run libxml2
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libpng
+Add_dependency run sqlite
+Add_dependency run icu-libs
+Add_dependency run libX11
+Add_dependency run libXt
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+3
+Add_dependency run gstreamer
+Add_dependency run gst-plugins-base
+Add_dependency run enchant
+Add_dependency run libsoup
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build perl ">=0"
+Add_dependency build gperf
+Add_dependency build bison
+Add_dependency build gobject-introspection
+Add_dependency build enchant-devel
+Add_dependency build gtk+3-devel
+Add_dependency build gst-plugins-base-devel
+Add_dependency build gstreamer-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 jpeg-devel
+Add_dependency build libsoup-devel
+Add_dependency build glib-devel
+Add_dependency build libxslt-devel
+Add_dependency build zlib-devel
+Add_dependency build libxml2-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libpng-devel
+Add_dependency build sqlite-devel
+Add_dependency build icu-devel
+Add_dependency build libXt-devel
+Add_dependency build libX11-devel
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
new file mode 100644
index 00000000000..d1ad80dc8cd
--- /dev/null
+++ b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
@@ -0,0 +1,44 @@
+# Template file for 'webkit-gtk-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 gperf
+Add_dependency run flex
+Add_dependency run enchant-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run gtk+-devel
+Add_dependency run gst-plugins-base-devel
+Add_dependency run gstreamer-devel
+Add_dependency run glib-devel
+Add_dependency run atk-devel
+Add_dependency run pango-devel
+Add_dependency run cairo-devel
+Add_dependency run jpeg-devel
+Add_dependency run libsoup-devel
+Add_dependency run libxslt-devel
+Add_dependency run zlib-devel
+Add_dependency run libxml2-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libpng-devel
+Add_dependency run sqlite-devel
+Add_dependency run icu-devel
+Add_dependency run libXt-devel
+Add_dependency run libX11-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
+Add_dependency run libstdc++-devel
+Add_dependency run webkit-gtk
+
+do_install()
+{
+ install -d ${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
+}
diff --git a/srcpkgs/wpa_supplicant/patches/dbus.patch b/srcpkgs/wpa_supplicant/patches/dbus.patch
new file mode 100644
index 00000000000..b69848e9b64
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/patches/dbus.patch
@@ -0,0 +1,61 @@
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c | 6 ++++++
+ wpa_supplicant/dbus/dbus_new.h | 1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- dbus/dbus_new.c
++++ dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ wpas_dbus_getter_current_network;
+ prop = "CurrentNetwork";
+ break;
++ case WPAS_DBUS_PROP_BSSS:
++ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++ prop = "BSSs";
++ break;
+ default:
+ wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ }
+
+ wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+
+ return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ }
+
+ wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+
+ return 0;
+
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- dbus/dbus_new.h
++++ dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ WPAS_DBUS_PROP_STATE,
+ WPAS_DBUS_PROP_CURRENT_BSS,
+ WPAS_DBUS_PROP_CURRENT_NETWORK,
++ WPAS_DBUS_PROP_BSSS,
+ };
+
+ enum wpas_dbus_bss_prop {
+--
+1.7.4-rc1
+
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index e2f25119ad3..908d79060e4 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
# Template file for 'wpa_supplicant'
pkgname=wpa_supplicant
version=0.7.3
-revision=1
+revision=2
wrksrc=${pkgname}-${version}/${pkgname}
distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz"
build_style=custom-install
@@ -38,13 +38,12 @@ do_build()
{
sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile
cp -f ${FILESDIR}/config ${wrksrc}/.config
- make ${makejobs} || return 1
+ make ${makejobs}
}
do_install()
{
- cd ${wrksrc} || return 1
- make PREFIX=/usr DESTDIR=${DESTDIR} install || return 1
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
install -d ${DESTDIR}/etc/init.d
install -m755 ${FILESDIR}/${pkgname}.rc \
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index 304fc61b330..b903e7e940c 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -1,6 +1,6 @@
# Template file for 'xbmc'
pkgname=xbmc
-version=10.0
+version=10.1
distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
build_style=gnu_configure
short_desc="XBMC Media Center"
@@ -8,7 +8,7 @@ configure_args="--disable-hal --disable-webserver --disable-debug
--disable-external-python --enable-goom --enable-mid LDFLAGS="
make_install_target="prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr install"
maintainer="Juan RP "
-checksum=06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
+checksum=3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
long_desc="
XBMC is an award-winning free and open source (GPL) software media player
and entertainment hub for digital media. XBMC is available for Linux, OSX,
@@ -59,6 +59,9 @@ Add_dependency run libssl
Add_dependency run libmad
Add_dependency run fontconfig
Add_dependency run libXrender
+Add_dependency run bzip2
+Add_dependency run libsamplerate
+Add_dependency run libmms
Add_dependency build pkg-config
Add_dependency build automake
@@ -105,6 +108,7 @@ Add_dependency build libXrender-devel
Add_dependency build libsamplerate-devel
Add_dependency build libmms-devel
Add_dependency build enca-devel
+Add_dependency build bzip2-devel
Add_dependency full dbus ">=0"
Add_dependency full udisks ">=0"
diff --git a/srcpkgs/xbps-casper/files/hooks/casper b/srcpkgs/xbps-casper/files/hooks/casper
index 3f9c8326898..ea9fd214e71 100755
--- a/srcpkgs/xbps-casper/files/hooks/casper
+++ b/srcpkgs/xbps-casper/files/hooks/casper
@@ -61,7 +61,6 @@ manual_add_modules ohci1394
for helper in getty login new-uuid snapshot; do
ln -s /sbin/casper-${helper} ${DESTDIR}/bin
done
-cp /usr/share/initramfs-tools/scripts/casper-functions $DESTDIR/scripts
cp /usr/share/initramfs-tools/scripts/casper-helpers $DESTDIR/scripts
auto_add_modules net
diff --git a/srcpkgs/xbps-casper/files/scripts/casper b/srcpkgs/xbps-casper/files/scripts/casper
index d534ad6391f..ffe7329cf03 100644
--- a/srcpkgs/xbps-casper/files/scripts/casper
+++ b/srcpkgs/xbps-casper/files/scripts/casper
@@ -23,6 +23,7 @@ tried=/tmp/tried
[ -f /etc/casper.conf ] && . /etc/casper.conf
export USERNAME USERFULLNAME HOST BUILD_SYSTEM
+. /scripts/functions
. /scripts/casper-helpers
if [ ! -f /casper.vars ]; then
@@ -40,12 +41,6 @@ parse_cmdline() {
export PERSISTENT="" ;;
union=*)
export UNIONFS="${x#union=}";;
- ip*)
- STATICIP=${x#ip=}
- if [ "${STATICIP}" = "" ]; then
- STATICIP="frommedia"
- fi
- export STATICIP ;;
ignore_uuid)
IGNORE_UUID="Yes" ;;
live-media-path=*)
@@ -186,74 +181,6 @@ copy_live_to() {
return 0
}
-do_netmount() {
- rc=1
-
- modprobe "${MP_QUIET}" af_packet # For DHCP
-
- /sbin/udevadm trigger --action=add
- /sbin/udevadm settle
-
- ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf | tee /netboot.config
-
- if [ "${NFSROOT}" = "auto" ]; then
- NFSROOT=${ROOTSERVER}:${ROOTPATH}
- fi
-
- [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
-
- if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
- rc=0
- elif do_nfsmount ; then
- NETBOOT="nfs"
- export NETBOOT
- rc=0
- fi
-
- [ "$quiet" != "y" ] && log_end_msg
- return ${rc}
-}
-
-do_nfsmount() {
- rc=1
- modprobe "${MP_QUIET}" nfs
- if [ -z "${NFSOPTS}" ]; then
- NFSOPTS=""
- fi
-
- [ "$quiet" != "y" ] && \
- log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
- # FIXME: This while loop is an ugly HACK round an nfs bug
- i=0
- while [ "$i" -lt 60 ]; do
- nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" \
- "${mountpoint}" && rc=0 && break
- sleep 1
- i="$(($i + 1))"
- done
- return ${rc}
-}
-
-do_cifsmount() {
- rc=1
- if [ -x "/sbin/mount.cifs" ]; then
- if [ -z "${NFSOPTS}" ]; then
- CIFSOPTS="-ouser=root,password="
- else
- CIFSOPTS="${NFSOPTS}"
- fi
-
- [ "$quiet" != "y" ] && \
- log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
- modprobe "${MP_QUIET}" cifs
-
- if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
- rc=0
- fi
- fi
- return ${rc}
-}
-
do_snap_copy ()
{
fromdev="${1}"
@@ -577,28 +504,18 @@ mountroot() {
wait_for_udev 10
maybe_break casper-premount
- [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount"
+ log_begin_msg "Running /scripts/casper-premount"
run_scripts /scripts/casper-premount
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
- if [ ! -z "${NETBOOT}" ]; then
- if do_netmount ; then
- livefs_root="${mountpoint}"
- else
- panic "Unable to find a live file system on the network"
- fi
- else
- # Scan local devices for the image
- i=0
- while [ "$i" -lt 60 ]; do
- livefs_root=$(find_livefs $i)
- if [ "${livefs_root}" ]; then
- break
- fi
- sleep 1
- i="$(($i + 1))"
- done
- fi
+ # Scan local devices for the image
+ i=0
+ while [ "$i" -lt 60 ]; do
+ livefs_root=$(find_livefs $i)
+ [ -n "${livefs_root}" ] && break
+ sleep 1
+ i="$(($i + 1))"
+ done
if [ -z "${livefs_root}" ]; then
panic "Unable to find a medium containing a live file system"
@@ -610,16 +527,15 @@ mountroot() {
live_dest="${TODISK}"
fi
if [ "${live_dest}" ]; then
- [ "$quiet" != "y" ] && \
- log_begin_msg "Copying live_media to ${live_dest}"
+ log_begin_msg "Copying live_media to ${live_dest}"
copy_live_to "${livefs_root}" "${live_dest}"
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
fi
mount_images_in_directory "${livefs_root}" "${rootmnt}"
maybe_break casper-bottom
- [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
+ log_begin_msg "Running /scripts/casper-bottom"
run_scripts /scripts/casper-bottom
- [ "$quiet" != "y" ] && log_end_msg
+ log_end_msg
}
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints b/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
index d85b2dab0a0..5a53736e285 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
@@ -3,7 +3,7 @@
PREREQ=""
DESCRIPTION="Setting up /cdrom mountpoint"
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser b/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
index 6911c660b38..7d58f823b2b 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
@@ -3,7 +3,7 @@
PREREQ=""
DESCRIPTION="Setting up live session user '$USERNAME'"
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
@@ -22,7 +22,7 @@ log_begin_msg "$DESCRIPTION"
# U6aMy0wojraho is just a blank password
chroot ${rootmnt} useradd -c "$USERFULLNAME" -m $USERNAME \
- -G audio -p U6aMy0wojraho
+ -G audio,video,wheel -p U6aMy0wojraho
if [ -f ${rootmnt}/etc/sudoers ]; then
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> ${rootmnt}/etc/sudoers
fi
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
index 3257de75aeb..1b640c51977 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
@@ -3,7 +3,7 @@
PREREQ=""
DESCRIPTION="Setting up system keymap"
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab b/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
index 23f6cf26ae6..7f42918a61d 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
@@ -4,7 +4,7 @@ PREREQ=""
DESCRIPTION="Setting up /etc/fstab"
FSTAB=${rootmnt}/etc/fstab
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
index e53ff5c1c79..37caa78f656 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
@@ -4,7 +4,7 @@ PREREQ=""
DESCRIPTION="Setting up swap"
FSTAB=${rootmnt}/etc/fstab
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
index 5824fb085ca..5d4a58a236f 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
@@ -3,7 +3,7 @@
PREREQ=""
DESCRIPTION="Setting up system locale"
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
index d5cf480f7ec..3179361256c 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
@@ -3,6 +3,8 @@
PREREQ=""
DESCRIPTION="Setting up automatic login"
+[ -r /scripts/functions ] && . /scripts/functions
+
prereqs()
{
echo "$PREREQ"
@@ -16,8 +18,6 @@ prereqs)
;;
esac
-. /scripts/casper-functions
-
log_begin_msg "$DESCRIPTION"
# Enable autologin for getty(1).
@@ -28,11 +28,7 @@ fi
# Configure GDM autologin
if [ -d /root/etc/gdm ]; then
GDMCustomFile=/root/etc/gdm/custom.conf
- AutologinParameters="AutomaticLoginEnable=true\n\
-AutomaticLogin=$USERNAME\n\
-TimedLoginEnable=true\n\
-TimedLogin=$USERNAME\n\
-TimedLoginDelay=10"
+ AutologinParameters="AutomaticLoginEnable=true\nAutomaticLogin=$USERNAME"
# Prevent from updating if parameters already present (persistent usb key)
if ! `grep -qs 'AutomaticLoginEnable' $GDMCustomFile` ; then
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname b/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
index 9eba97dd141..a7e6828ab16 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
@@ -3,7 +3,7 @@
PREREQ=""
DESCRIPTION="Setting up hostname"
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
prereqs()
{
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu b/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
index 3a6a1b991d7..7e4bb1a8b21 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
@@ -3,6 +3,8 @@
PREREQ=""
DESCRIPTION="Modifying PolicyKit grants for '$USERNAME' user"
+[ -r /scripts/functions ] && . /scripts/functions
+
prereqs()
{
echo "$PREREQ"
@@ -16,8 +18,6 @@ prereqs)
;;
esac
-. /scripts/casper-functions
-
# Check that polkit is installed.
if [ ! -x "/root/usr/libexec/polkitd" ]; then
exit 0
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-functions b/srcpkgs/xbps-casper/files/scripts/casper-functions
deleted file mode 100644
index 3dc9c3bc202..00000000000
--- a/srcpkgs/xbps-casper/files/scripts/casper-functions
+++ /dev/null
@@ -1,12 +0,0 @@
-
-. /scripts/functions
-
-# Print a message and wait for enter
-log_wait_msg()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "INPUTENTER $@"
- read nunya < /dev/.initramfs/usplash_outfifo
- fi
- _log_msg "Waiting: $@ ..."
-}
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index 56f5ae2fcdf..4d60a2bcf1d 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -1,6 +1,6 @@
# Template file for 'xbps-casper'
pkgname=xbps-casper
-_localver=0.8 # XBPS package version
+_localver=0.14 # XBPS package version
_distver=1.236 # This should match the upstream (Ubuntu) version
version=${_localver}.${_distver}
build_style=custom-install
@@ -35,7 +35,7 @@ do_install()
install -m 755 ${FILESDIR}/hooks/* ${initramfsdir}/hooks
install -m 755 ${FILESDIR}/scripts/casper-bottom/* \
${initramfsdir}/scripts/casper-bottom
- install -m 644 ${FILESDIR}/scripts/{casper,casper-{functions,helpers}} \
+ install -m 644 ${FILESDIR}/scripts/{casper,casper-helpers} \
${initramfsdir}/scripts
install -m 644 ${FILESDIR}/conf.d/* ${initramfsdir}/conf.d
}
diff --git a/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
index 4f2d83c4186..f3b4cc1cb29 100644
--- a/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
+++ b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
@@ -123,13 +123,13 @@ LABEL linux
MENU LABEL Boot XBPS GNU/Linux ${kver} ($(uname -m))
KERNEL /casper/vmlinuz
INITRD /casper/initrd.lz
-APPEND boot=casper keymap=es locale=es_ES
+APPEND boot=casper keymap=es locale=es_ES quiet
LABEL linuxtoram
MENU LABEL Boot XBPS GNU/Linux ${kver} (toram) ($(uname -m))
KERNEL /casper/vmlinuz
INITRD /casper/initrd.lz
-APPEND boot=casper toram keymap=es locale=es_ES
+APPEND boot=casper toram keymap=es locale=es_ES quiet
LABEL c
MENU LABEL Boot first HD found by the BIOS
@@ -188,6 +188,7 @@ fi
xbps-bin.static -r $TEMP_ROOTFS -y install ${PACKAGE_LIST} || error_out $?
xbps-bin.static -r $TEMP_ROOTFS -y autoupdate || error_out $?
xbps-bin.static -r $TEMP_ROOTFS -yp autoremove || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS -yvp purge all || error_out $?
xbps-bin.static -r $TEMP_ROOTFS list > ${OUTPUT_FILE%.iso}-package-list.txt
info_msg "Creating /etc/motd..."
diff --git a/srcpkgs/xbps-mklive/template b/srcpkgs/xbps-mklive/template
index 94cedb33397..5db82806368 100644
--- a/srcpkgs/xbps-mklive/template
+++ b/srcpkgs/xbps-mklive/template
@@ -1,6 +1,6 @@
# Template file for 'xbps-mklive'
pkgname=xbps-mklive
-version=0.3.3
+version=0.3.5
build_style=custom-install
short_desc="XBPS Live image maker"
maintainer="Juan RP "
@@ -14,7 +14,7 @@ noarch=yes
Add_dependency full cdrtools
Add_dependency full squashfs-tools
Add_dependency full syslinux
-Add_dependency full initramfs-tools ">=0.99.debian0.94.4"
+Add_dependency full initramfs-tools
do_build()
{
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index c07865d7768..145da9eec91 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -1,11 +1,11 @@
# Template build file for 'xf86-video-ati'.
pkgname=xf86-video-ati
-version=6.14.0
+version=6.14.1
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Xorg ATI Radeon video driver"
maintainer="Juan RP "
-checksum=9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
+checksum=e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
long_desc="
This is the video driver for ATI Radeon cards for the Xorg X11 server."
diff --git a/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch b/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch
new file mode 100644
index 00000000000..460510df42a
--- /dev/null
+++ b/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- src/xfpm-notify.c.orig 2011-02-28 23:43:55.521921469 +0100
++++ src/xfpm-notify.c 2011-02-28 23:44:16.343032607 +0100
+@@ -209,14 +209,11 @@ xfpm_notify_new_notification_internal (c
+ {
+ NotifyNotification *n;
+
+- n = notify_notification_new (title, message, NULL, NULL);
++ n = notify_notification_new (title, message, NULL);
+
+ if ( icon_name )
+ xfpm_notify_set_notification_icon (n, icon_name);
+
+- if ( icon )
+- notify_notification_attach_to_status_icon (n, icon);
+-
+ notify_notification_set_urgency (n, (NotifyUrgency)urgency);
+
+ if ( timeout != 0)
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index a27d4f7fb86..72e6bb0b1e4 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,6 +1,7 @@
# Template file for 'xfce4-power-manager'
pkgname=xfce4-power-manager
version=1.0.3
+revision=1
distfiles="http://archive.xfce.org/src/apps/${pkgname}/1.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --enable-polkit --enable-dpms
diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 94f51787b07..65aefac96dc 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,6 +1,7 @@
# Template file for 'xfce4-settings'
pkgname=xfce4-settings
version=4.8.0
+revision=1
distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --enable-sound-settings
diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index cf0b6e8f56a..2ca128d9ba1 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,6 +1,7 @@
# Template file for 'xfdesktop'
pkgname=xfdesktop
version=4.8.0
+revision=1
distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Desktop manager for the XFce Desktop Environment"
diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 6454e7476bd..a09f07bcc32 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,12 +1,12 @@
# Template build file for 'xkeyboard-config'.
pkgname=xkeyboard-config
-version=2.1
+version=2.2.1
distfiles="http://www.x.org/releases/individual/data/$pkgname/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
short_desc="X Keyboard Configuration Database"
maintainer="Juan RP "
-checksum=f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
+checksum=642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
long_desc="
The xkeyboard-config package provides a non-arch keyboard configuration
database for the X Window System with support for non-standard
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 148a75cf453..9638b6baad3 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
-version=1.9.4
+version=1.9.5
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
@@ -12,7 +12,7 @@ configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
--disable-dmx --disable-xfree86-utils"
short_desc="Modular X11 server from modular X.org"
maintainer="Juan RP "
-checksum=ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
+checksum=3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
long_desc="
The X.org X11 Server from the modularized source tree of X.org."
diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index 4b6cd55e678..38ae2d831d5 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-video-drivers'
pkgname=xorg-video-drivers
version=7.6
-revision=1
+revision=2
build_style=meta-template
short_desc="X.org video drivers meta-package"
maintainer="Juan RP "
@@ -37,7 +37,7 @@ Add_dependency full xf86-video-intel ">=2.9.1"
#Add_dependency full xf86-video-s3virge ">=1.10.4"
#Add_dependency full xf86-video-savage ">=2.3.1"
#Add_dependency full xf86-video-siliconmotion ">=1.7.3"
-#Add_dependency full xf86-video-sis ">=0.10.2"
+Add_dependency full xf86-video-sis ">=0.10.3"
Add_dependency full xf86-video-sisusb ">=0.9.3"
#Add_dependency full xf86-video-tdfx ">=1.4.3"
#Add_dependency full xf86-video-trident ">=1.3.3"
diff --git a/srcpkgs/xproto/template b/srcpkgs/xproto/template
index a070608439d..d685e3999d8 100644
--- a/srcpkgs/xproto/template
+++ b/srcpkgs/xproto/template
@@ -1,11 +1,11 @@
# Template build file for 'xproto'.
pkgname=xproto
-version=7.0.18
+version=7.0.21
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="X protocol and ancillary headers from Xorg X11"
maintainer="Juan RP "
-checksum=b8efe0e75ca4ce3a56c9143e360c4f5b20750f4275e8fffbc015ed5e3a17c96a
+checksum=38ee2f032c3a9e30504593f8b5e6c1161a6629daba93748a71c6f70c16f65548
long_desc="
X protocol and ancillary headers from modular Xorg X11."
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index b449652d82a..7715120b82c 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -1,11 +1,11 @@
# Template build file for 'xrdb'.
pkgname=xrdb
-version=1.0.7
+version=1.0.9
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="X server resource database utility"
maintainer="Juan RP "
-checksum=0c70a433f78c1dd3bf02e44e03a7534f3fe3ff45643ecbd7844d0ca3c74157b1
+checksum=642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7
long_desc="
xrdb is a program to query a modify the resource database of a X server.
diff --git a/srcpkgs/xulrunner/template b/srcpkgs/xulrunner/template
index f0d1820e901..b1c4f593a18 100644
--- a/srcpkgs/xulrunner/template
+++ b/srcpkgs/xulrunner/template
@@ -1,7 +1,7 @@
# Template build file for 'xulrunner'.
pkgname=xulrunner
_xulver=1.9.2
-_xulpatchver=13
+_xulpatchver=15
_ffver=3.6.${_xulpatchver}
# Current xulrunner version is available at $wrksrc/config/milestone.txt
if [ -n "${_xulpatchver}" ]; then
@@ -25,7 +25,7 @@ configure_args="--enable-application=xulrunner --enable-libxul
--with-system-nspr --with-system-nss --enable-safe-browsing"
short_desc="XML User Interface Language runtime environment"
maintainer="Juan RP "
-checksum=4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63
+checksum=405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f
long_desc="
XULRunner is a runtime environment for applications using the
XML User Interface Language, XUL. It is the successor of the Gecko
@@ -87,12 +87,9 @@ Add_dependency build libIDL-devel
Add_dependency build nss-devel
Add_dependency build dbus-glib-devel
Add_dependency build startup-notification-devel
-Add_dependency build diffutils
pre_configure()
{
- # Use cmp(1) from diffutils
- export PATH="/usr/bin:/bin:$PATH"
# Detect python-2.7
sed -i -e "s|python2.5|python2.7|g" ${wrksrc}/configure
}
diff --git a/srcpkgs/xulrunner/xulrunner-devel.template b/srcpkgs/xulrunner/xulrunner-devel.template
index eb943b0a060..aec1b731185 100644
--- a/srcpkgs/xulrunner/xulrunner-devel.template
+++ b/srcpkgs/xulrunner/xulrunner-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 libgcc
Add_dependency run glibc
Add_dependency run libstdc++
diff --git a/srcpkgs/yelp-devel b/srcpkgs/yelp-devel
new file mode 120000
index 00000000000..df98b1a87ee
--- /dev/null
+++ b/srcpkgs/yelp-devel
@@ -0,0 +1 @@
+yelp
\ No newline at end of file
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
new file mode 100644
index 00000000000..56f1e01975d
--- /dev/null
+++ b/srcpkgs/yelp-xsl/template
@@ -0,0 +1,23 @@
+# Template file for 'yelp-xsl'
+pkgname=yelp-xsl
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+short_desc="Help browser for GNOME desktop - XSL and misc files"
+maintainer="Juan RP "
+checksum=60d62ad2f747e5f7564be5d4e7d014164b1951dc7aa9f65cd4c2c6150ea5d8e3
+long_desc="
+ Yelp is the help browser for GNOME2. It lets you navigate through all
+ installed documentation.
+
+ This package contains some XSL and misc files required by Yelp."
+
+noarch=yes
+Add_dependency build pkg-config
+Add_dependency build intltool
+
+post_install()
+{
+ install -d ${DESTDIR}/usr/lib
+ mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/yelp/depends b/srcpkgs/yelp/depends
new file mode 100644
index 00000000000..6e8d7e9a547
--- /dev/null
+++ b/srcpkgs/yelp/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.91.90"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/yelp/patches/yelp.schemas_remove_gettext_domain.patch b/srcpkgs/yelp/patches/yelp.schemas_remove_gettext_domain.patch
deleted file mode 100644
index 84274bb6a25..00000000000
--- a/srcpkgs/yelp/patches/yelp.schemas_remove_gettext_domain.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Vanilla GConf doesn't grok , so remove it.
-
---- data/yelp.schemas.orig 2010-04-15 07:53:39.692137467 +0200
-+++ data/yelp.schemas 2010-04-15 07:53:53.943142241 +0200
-@@ -7,7 +7,6 @@
- yelp
- bool
- true
-- yelp
-
- Use caret
- Use a keyboard-controllable caret when viewing pages.
-@@ -19,7 +18,6 @@
- yelp
- bool
- true
-- yelp
-
- Use system fonts
- Use the default fonts set for the system.
-@@ -31,7 +29,6 @@
- yelp
- string
- Sans 12
-- yelp
-
- Font for text
- Font for text with variable width.
-@@ -43,7 +40,6 @@
- yelp
- string
- Monospace 12
-- yelp
-
- Font for fixed text
- Font for text with fixed width.
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 8bf59cb2274..8aa7efc8f72 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,76 +1,65 @@
# Template file for 'yelp'
pkgname=yelp
-version=2.30.2
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---with-search=basic"
+configure_args="--disable-schemas-compile --localstatedir=/var"
short_desc="Help browser for GNOME desktop"
maintainer="Juan RP "
-checksum=5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
+checksum=3061eb1ffba89d3724c4c80b9b1520de583fe032c2001ed2fcf455c0a5f3ffa1
long_desc="
Yelp is the help browser for GNOME2. It lets you navigate through all
installed documentation."
-gconf_schemas="yelp.schemas"
+keep_empty_dirs=yes
+subpackages="yelp-devel"
+triggers="gsettings-schemas"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-Add_dependency run libgcc
Add_dependency run glibc
-Add_dependency run libstdc++
Add_dependency run zlib
Add_dependency run bzip2
-Add_dependency run nspr
-Add_dependency run atk
+Add_dependency run liblzma
+Add_dependency run libxml2
+Add_dependency run libxslt
+Add_dependency run libgcrypt
+Add_dependency run libgpg-error
+Add_dependency run sqlite
Add_dependency run glib
+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 libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run libgcrypt
-Add_dependency run libgpg-error
-Add_dependency run libxml2
-Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run libX11
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run xulrunner
-Add_dependency run startup-notification
-Add_dependency run libxslt
-Add_dependency run rarian
-Add_dependency run GConf
+Add_dependency run gtk+3
+Add_dependency run libsoup
+Add_dependency run webkit-gtk3
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build xulrunner-devel
-Add_dependency build startup-notification-devel
+Add_dependency build bzip2-devel
+Add_dependency build liblzma-devel
Add_dependency build libxslt-devel
-Add_dependency build rarian-devel
-Add_dependency build GConf-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 zlib-devel
Add_dependency build libgcrypt-devel
Add_dependency build libgpg-error-devel
Add_dependency build libxml2-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build zlib-devel
-Add_dependency build bzip2-devel
-Add_dependency build libX11-devel
-Add_dependency build nspr-devel
-Add_dependency build libSM-devel
-Add_dependency build libICE-devel
-Add_dependency build libstdc++-devel
+Add_dependency build sqlite-devel
+Add_dependency build webkit-gtk3-devel
+Add_dependency build gtk+3-devel
+Add_dependency build libsoup-devel
+Add_dependency build atk-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 glib-devel
+Add_dependency full yelp-xsl
Add_dependency full gnome-doc-utils
Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils
diff --git a/srcpkgs/yelp/yelp-devel.template b/srcpkgs/yelp/yelp-devel.template
new file mode 100644
index 00000000000..17f0f5e7787
--- /dev/null
+++ b/srcpkgs/yelp/yelp-devel.template
@@ -0,0 +1,17 @@
+# Template file for 'yelp-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run nautilus
+
+do_install()
+{
+ mkdir -p ${DESTDIR}/usr/{lib,share}
+ mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+ mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+ #mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index 078d13c1493..b919b5da122 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,12 +1,12 @@
# Template file for 'zenity'
pkgname=zenity
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=3.0.0
+distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--localstatedir=/var --disable-scrollkeeper"
short_desc="Display GNOME dialogs from the command line"
maintainer="Juan RP "
-checksum=8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
+checksum=b1965b6704e80665c551261b9895a06322aba3f9776f8e5dd8141c7e8aca5131
long_desc="
This is zenity - a rewrite of gdialog, the GNOME port of dialog
which allows you to display dialog boxes from the command line
@@ -15,16 +15,16 @@ long_desc="
Add_dependency run glibc
Add_dependency run glib
+Add_dependency run pango
Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
Add_dependency run libX11
+Add_dependency run gtk+3
Add_dependency run libnotify
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build gnome-doc-utils
Add_dependency build glib-devel
-Add_dependency build gtk+-devel
Add_dependency build libX11-devel
+Add_dependency build gtk+-devel
Add_dependency build libnotify-devel
-
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index f5008546a75..5ff2b275feb 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -126,7 +126,7 @@ libXau.so libXau libXau-devel
libexslt.so libxslt libxslt-devel
libxslt.so libxslt libxslt-devel
libstartup-notification-1.so startup-notification startup-notification-devel
-libwnck-1.so.22 libwnck libwnck-devel
+libwnck-3.so libwnck libwnck-devel
libnl.so libnl libnl-devel
libssl.so libssl openssl-devel
libcrypto.so libssl openssl-devel
@@ -141,6 +141,7 @@ libgstreamer-0.10.so gstreamer gstreamer-devel
libgstbase-0.10.so gstreamer gstreamer-devel
libgstdataprotocol-0.10.so gstreamer gstreamer-devel
libgstcontroller-0.10.so gstreamer gstreamer-devel
+libgstnet-0.10.so gstreamer gstreamer-devel
libgstfft-0.10.so gst-plugins-base gst-plugins-base-devel
libgstaudio-0.10.so gst-plugins-base gst-plugins-base-devel
libgstapp-0.10.so gst-plugins-base gst-plugins-base-devel
@@ -251,6 +252,7 @@ libdrm.so libdrm libdrm-devel
libdrm_radeon.so libdrm libdrm-devel
libdrm_intel.so libdrm libdrm-devel
libdrm_nouveau.so libdrm libdrm-devel
+libkms.so libdrm libdrm-devel
libXxf86vm.so libXxf86vm libXxf86vm-devel
libXi.so libXi libXi-devel
libdmx.so libdmx libdmx-devel
@@ -347,6 +349,7 @@ libavahi-glib.so avahi-glib-libs avahi-glib-libs-devel
libdns_sd.so avahi-compat-libs avahi-compat-libs-devel
libhowl.so avahi-compat-libs avahi-compat-libs-devel
libavahi-ui.so avahi-ui-libs avahi-ui-libs-devel
+libavahi-ui-gtk3.so avahi-ui-libs-gtk3 avahi-ui-libs-devel
libmp4v2.so libmp4v2 libmp4v2-devel
libmp4av.so libmp4v2 libmp4v2-devel
libmpeg4ip_gnu.so libmp4v2 libmp4v2-devel
@@ -357,12 +360,12 @@ libgif.so giflib giflib-devel
libungif.so giflib giflib-devel
libImlib2.so imlib2 imlib2-devel
libmp3lame.so lame lame-devel
-libavdevice.so.52 ffmpeg ffmpeg-devel
-libavformat.so.52 ffmpeg ffmpeg-devel
-libswscale.so ffmpeg ffmpeg-devel
-libpostproc.so.51 ffmpeg ffmpeg-devel
-libavcodec.so.52 ffmpeg ffmpeg-devel
-libavutil.so.49 ffmpeg ffmpeg-devel
+libavdevice.so.52 libavdevice ffmpeg-devel
+libavformat.so.52 libavformat ffmpeg-devel
+libswscale.so libswscale ffmpeg-devel
+libpostproc.so.51 libpostproc ffmpeg-devel
+libavcodec.so.52 libavcodec ffmpeg-devel
+libavutil.so.50 libavutil ffmpeg-devel
libSDL-1.2.so SDL SDL-devel
libSDL_image-1.2.so SDL_image SDL_image-devel
libx264.so.93 x264 x264-devel
@@ -466,21 +469,22 @@ libxlutil.so.1 xen xen-devel
libvhd.so.1 xen xen-devel
libbabl-0.1.so babl babl-devel
libgegl-0.1.so gegl gegl-devel
-libiculx.so.42 icu-libs icu-devel
-libicule.so.42 icu-libs icu-devel
-libicuio.so.42 icu-libs icu-devel
-libicui18n.so.42 icu-libs icu-devel
-libicudata.so.42 icu-libs icu-devel
-libicutu.so.42 icu-libs icu-devel
-libicuuc.so.42 icu-libs icu-devel
+libiculx.so.46 icu-libs icu-devel
+libicule.so.46 icu-libs icu-devel
+libicuio.so.46 icu-libs icu-devel
+libicui18n.so.46 icu-libs icu-devel
+libicudata.so.46 icu-libs icu-devel
+libicutu.so.46 icu-libs icu-devel
+libicuuc.so.46 icu-libs icu-devel
libaspell.so.15 aspell aspell-devel
libhunspell-1.2.so hunspell hunspell-devel
libenchant.so enchant enchant-devel
libgconf-2.so GConf GConf-devel
libsoup-2.4.so libsoup libsoup-devel
libsoup-gnome-2.4.so libsoup-gnome libsoup-gnome-devel
-libunique-1.0.so libunique libunique-devel
+libunique-3.0.so libunique libunique-devel
libwebkit-1.0.so webkit-gtk webkit-gtk-devel
+libwebkitgtk-3.0.so webkit-gtk3 webkit-gtk3-devel
libgimp-2.0.so gimp gimp-devel
libgimpwidgets-2.0.so gimp gimp-devel
libgimpui-2.0.so gimp gimp-devel
@@ -544,38 +548,33 @@ libcanberra-gtk.so libcanberra libcanberra-devel
libcanberra-gtk3.so libcanberra libcanberra-devel
libgtop-2.0.so libgtop libgtop-devel
librarian.so rarian rarian-devel
-libgnome-desktop-2.so.17 gnome-desktop gnome-desktop-devel
+libgnome-desktop-3.so gnome-desktop gnome-desktop-devel
libmetacity-private.so metacity metacity-devel
-libbonobo-2.so.0 libbonobo libbonobo-devel
-libbonobo-activation.so libbonobo libbonobo-devel
libORBitCosNaming-2.so ORBit2 ORBit2-devel
libORBit-imodule-2.so ORBit2 ORBit2-devel
libORBit-2.so ORBit2 ORBit2-devel
-libgnomevfs-2.so gnome-vfs gnome-vfs-devel
-libgnome-2.so libgnome libgnome-devel
libgnome-media-profiles.so gnome-media gnome-media-devel
libgnome-menu.so gnome-menus gnome-menus-devel
libart_lgpl_2.so libart libart-devel
libgnomecanvas-2.so libgnomecanvas libgnomecanvas-devel
-libbonoboui-2.so libbonoboui libbonoboui-devel
-libgp11.so gnome-keyring gnome-keyring-devel
-libgcr.so gnome-keyring gnome-keyring-devel
+libgcr-3.so gnome-keyring gnome-keyring-devel
+libgck.so gnome-keyring gnome-keyring-devel
libgnome-keyring.so libgnome-keyring libgnome-keyring-devel
-libgweather.so libgweather libgweather-devel
+libgweather-3.so libgweather libgweather-devel
libical.so libical libical-devel
libicalss.so libical libical-devel
libicalvcal.so libical libical-devel
-libcamel-1.2.so.19 evolution-data-server evolution-data-server-devel
-libcamel-provider-1.2.so.19 evolution-data-server evolution-data-server-devel
+libcamel-1.2.so.23 evolution-data-server evolution-data-server-devel
+libcamel-provider-1.2.so.23 evolution-data-server evolution-data-server-devel
libebackend-1.2.so evolution-data-server evolution-data-server-devel
libebook-1.2.so.10 evolution-data-server evolution-data-server-devel
libecal-1.2.so evolution-data-server evolution-data-server-devel
libedata-book-1.2.so evolution-data-server evolution-data-server-devel
-libedata-cal-1.2.so.10 evolution-data-server evolution-data-server-devel
+libedata-cal-1.2.so.11 evolution-data-server evolution-data-server-devel
libedataserver-1.2.so.14 evolution-data-server evolution-data-server-devel
-libedataserverui-1.2.so.11 evolution-data-server evolution-data-server-devel
+libedataserverui-3.0.so evolution-data-server evolution-data-server-devel
libegroupwise-1.2.so.13 evolution-data-server evolution-data-server-devel
-libgdata-1.2.so evolution-data-server evolution-data-server-devel
+libgdata.so.11 evolution-data-server evolution-data-server-devel
libgdata-google-1.2.so evolution-data-server evolution-data-server-devel
libpcap.so libpcap libpcap-devel
libiptc.so iptables iptables-devel
@@ -586,9 +585,8 @@ libipq.so iptables iptables-devel
libnm-util.so NetworkManager NetworkManager-devel
libnm-glib.so NetworkManager NetworkManager-devel
libnm-glib-vpn.so NetworkManager NetworkManager-devel
-libpanel-applet-2.so gnome-panel gnome-panel-devel
-libpanel-applet-3.so gnome-panel gnome-panel-devel
-libgnome-window-settings.so gnome-control-center gnome-control-center-devel
+libpanel-applet-4.so gnome-panel gnome-panel-devel
+libgnome-control-center.so gnome-control-center gnome-control-center-devel
libboost_date_time.so.1.44 boost boost-devel
libboost_math_tr1f.so.1.44 boost boost-devel
libboost_serialization.so.1.44 boost boost-devel
@@ -617,7 +615,7 @@ liblvm2app.so.2 liblvm2app liblvm2app-devel
libgdu.so gnome-disk-utility gnome-disk-utility-devel
libgdu-gtk.so gnome-disk-utility gnome-disk-utility-devel
libcpufreq.so libcpufreq libcpufreq-devel
-libgucharmap.so gucharmap gucharmap-devel
+libgucharmap_2_90.so gucharmap gucharmap-devel
libgphoto2.so libgphoto2 libgphoto2-devel
libgphoto2_port.so libgphoto2 libgphoto2-devel
libgvfscommon.so gvfs gvfs-devel
@@ -633,11 +631,12 @@ libglibmm_generate_extra_defs-2.4.so glibmm glibmm-devel
libcairomm-1.0.so cairomm cairomm-devel
libpangomm-1.4.so pangomm pangomm-devel
libatkmm-1.6.so atkmm atkmm-devel
-libgtkmm-2.4.so gtkmm gtkmm-devel
-libgdkmm-2.4.so gtkmm gtkmm-devel
+libgtkmm-3.0.so gtkmm gtkmm-devel
+libgdkmm-3.0.so gtkmm gtkmm-devel
libgksu2.so libgksu libgksu-devel
libseed.so libseed libseed-devel
libgnome-bluetooth.so gnome-bluetooth gnome-bluetooth-devel
+libgnome-bluetooth-applet.so gnome-bluetooth gnome-bluetooth-devel
libsasl2.so libsasl libsasl-devel
liblber-2.4.so libldap libldap-devel
libldap-2.4.so libldap libldap-devel
@@ -663,12 +662,11 @@ libopen-pal.so openmpi openmpi-devel
libopen-rte.so openmpi openmpi-devel
libmtp.so libmtp libmtp-devel
libelf.so libelf libelf-devel
-libgtksourceview-2.0.so gtksourceview gtksourceview-devel
+libgtksourceview-3.0.so gtksourceview gtksourceview-devel
libtalloc.so talloc talloc-devel
libmount.so libmount libmount-devel
libgdata.so libgdata libgdata-devel
libdconf.so dconf dconf-devel
-libspi.so at-spi at-spi-devel
libassuan.so libassuan libassuan-devel
libgpgme.so.11 gpgme gpgme-devel
libgpgme-pthread.so.11 gpgme gpgme-devel
@@ -726,7 +724,7 @@ libjasper.so libjasper jasper-devel
librecode.so librecode recode-devel
libenca.so libenca enca-devel
libwavpack.so libwavpack wavpack-devel
-libvala-0.10.so libvala vala-devel
+libvala-0.12.so libvala vala-devel
libSDL_net-1.2.so SDL_net SDL_net-devel
libmodplug.so libmodplug libmodplug-devel
VBoxVMM.so virtualbox-ose
@@ -769,6 +767,39 @@ liblightdm-gobject-0.so liblightdm-gobject lightdm-devel
liblightdm-qt.so liblightdm-qt lightdm-devel
libcelt051.so celt051 celt051-devel
libspice-server.so spice spice-devel
-libbrasero-burn.so brasero brasero-devel
-libbrasero-media.so brasero brasero-devel
-libbrasero-utils.so brasero brasero-devel
+libbrasero-burn3.so brasero brasero-devel
+libbrasero-media3.so brasero brasero-devel
+libbrasero-utils3.so brasero brasero-devel
+libXss.so libXScrnSaver libXScrnSaver-devel
+libyelp.so yelp yelp-devel
+libpeas-1.0.so libpeas libpeas-devel
+libpeas-gtk-1.0.so libpeas libpeas-devel
+libtotem.so totem totem-devel
+libclutter-glx-1.0.so clutter clutter-devel
+libmutter-private.so mutter mutter-devel
+libmutter-wm.so mutter mutter-devel
+libgjs.so gjs gjs-devel
+libgjs-gi.so gjs gjs-devel
+libgjs-dbus.so gjs gjs-devel
+libtelepathy-glib.so telepathy-glib telepathy-glib-devel
+libgedit-private.so gedit gedit-devel
+libaccountsservice.so accountsservice accountsservice-devel
+libgee.so libgee libgee-devel
+libfolks.so.22 folks folks-devel
+libfolks-telepathy.so.22 folks folks-devel
+libnice.so.10 libnice libnice-devel
+libgupnp-igd-1.0.so gupnp-igd gupnp-igd-devel
+libgstfarsight-0.10.so farsight2 farsight2-devel
+libtelepathy-farsight.so telepathy-farsight telepathy-farsight-devel
+libtelepathy-logger.so telepathy-logger telepathy-logger-devel
+libmission-control-plugins.so telepathy-mission-control telepathy-mission-control-devel
+libclutter-gtk-1.0.so clutter-gtk clutter-gtk-devel
+libchamplain-0.10.so libchamplain libchamplain-devel
+libchamplain-gtk-0.10.so libchamplain libchamplain-devel
+libgeoclue.so geoclue geoclue-devel
+libgnome-shell.so gnome-shell
+libvpx.so libvpx libvpx-devel
+libXevie.so libXevie libXevie-devel
+libatspi.so at-spi2-core at-spi2-core-devel
+libmutter.so mutter mutter-devel
+libvte2_90.so vte3 vte3-devel