Version bump and remove old.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

9 files changed, 21 insertions, 750 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 8a37c4ea65aa..40a9490bc649 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.229 2010/10/20 20:52:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.230 2010/11/19 22:17:31 pacho Exp $
+
+*gnome-terminal-2.32.1 (19 Nov 2010)
+
+  19 Nov 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-terminal-2.13.90-TERM-gnome.patch,
+  -files/gnome-terminal-2.24.2-restore-switch-to-tab.patch,
+  -files/gnome-terminal-2.26.3.1-cwd-on-new-tab.patch,
+  -files/gnome-terminal-2.26.3.1-en_GB.patch,
+  -files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch,
+  -files/gnome-terminal-2.26.3.1-remove-plural.patch,
+  -gnome-terminal-2.32.0.ebuild, +gnome-terminal-2.32.1.ebuild:
+  Version bump and remove old.
 
 *gnome-terminal-2.32.0 (20 Oct 2010)
 
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index a0d5c9df5c3a..cf7098cef549 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
-AUX gnome-terminal-2.24.2-restore-switch-to-tab.patch 15041 RMD160 5860f46b1379dd40cd8ca9c9e23b30be5ef3e7cb SHA1 3ab937c566c401ad1ee82313cc6989338209fc47 SHA256 7edf095b8e037bcb2d41807eb3d26a6d4c9413088e1c9b58e4ef5eebf4c3a36e
-AUX gnome-terminal-2.26.3.1-cwd-on-new-tab.patch 7074 RMD160 36deb7b2808fe5db59fa3f3ae75c141d02d8c511 SHA1 64ac74d3eecff49416f93f02dc957b7fc00a91ce SHA256 7603ff478f8882816cc26f401f5dceca160bdab99878aa615eee34259efb93dd
-AUX gnome-terminal-2.26.3.1-en_GB.patch 697 RMD160 c51011605f1af753ffde6e146071cc81c2f87124 SHA1 d1a69db6616aa39c6921fa30fcb85e7fac2d0688 SHA256 a795069430962a1d53d111bc345297289c06d44fc391e3408d0bb2c67c5d3e62
-AUX gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch 2667 RMD160 b1f3ce54c8a90a54d1c2e5f1f87195c8d3c7f8fa SHA1 6c0b4d0a35c04b88b7219cd09f246fd489ec4808 SHA256 6b3fd92d3dced996fe09718873b007335fac14171fb667e7c04c9dc883d121a7
-AUX gnome-terminal-2.26.3.1-remove-plural.patch 624 RMD160 5b260d0407b8824aed762af5d387ac3532431355 SHA1 2f2386bb930b3cc61a7a99990996c12a2c1a2ab8 SHA256 3adfefbe62233b37c373fd49e5ab0c58055d25ff4b937f386f994240b2d7894c
 DIST gnome-terminal-2.30.2.tar.bz2 2250070 RMD160 cabf51649dafa6ccf0bbf2903fa081315d7e2933 SHA1 ab97acd3d70bdcc468975a49b23ebb05f6e9bc49 SHA256 2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a
-DIST gnome-terminal-2.32.0.tar.bz2 2322564 RMD160 f361d956f39b16250eab10039b57f4c9587a5056 SHA1 7eb7679930fd34fd33391eb96b95a1daaa64f6dd SHA256 3e9f922bea4af7f016b66f3204266c8993582c51a12f6cfdce47607202400725
+DIST gnome-terminal-2.32.1.tar.bz2 2319315 RMD160 d381b468113bae89505436a931238e22f3f7794c SHA1 a4d803e4d372227f8a61ca3f5ed40391ff135adf SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
 EBUILD gnome-terminal-2.30.2.ebuild 1268 RMD160 6cfbc70d2f1e7430da9c5dbb91656428ef324535 SHA1 d904c5d9ec3cc4f1654f3acebf47d759051d3708 SHA256 73ea10e0a42eb2fb4c1584f4f56f302de0dc06dc4d1da0c51f49c555b834eea2
-EBUILD gnome-terminal-2.32.0.ebuild 1264 RMD160 3ffe1b50ae8996869ef29a476102b2b63905b399 SHA1 d6c6fdf0a1a542a2b03da5990e5d0101b4d4c32e SHA256 4d3bf82c1926786e5b09261d2a3f09780c07ada1ff36f025b9edf83e3f6c92f1
-MISC ChangeLog 32213 RMD160 a61b029efb1e2b306a5cb378de85670d39231cdc SHA1 da4b4cd754134a919a3df5bff745ea303f308abb SHA256 7b268228546a82a88ee09f1b55d95b46cf3c3233f2880a0793a063dd98ed4687
+EBUILD gnome-terminal-2.32.1.ebuild 1056 RMD160 8584a7db7de665d82f646a8e6f5bee7d209baa6c SHA1 0a028e1582809978739cf66b655b6417cd54fec7 SHA256 973d444aac26171ca9bafca7b4a217432d4cefb2532192c20ce4e6ac5f981699
+MISC ChangeLog 32723 RMD160 359c4aad3ec9fafdd97dfd01916f513a61fb8139 SHA1 4918f8e764982469331a0d64068502e7decf5f4b SHA256 e093efb2017046fe623f8aeaa5915110ebb4b77f91035df9b32b40a466c7d9cd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky/VpsACgkQ1fmVwcYIWAagSACeM5IzF/0ZxdgUVvo/s1lzvPx2
-NnUAnipNFq2P0uNo0G9FTc5qRfUoO7eG
-=ArDH
+iEYEARECAAYFAkzm94EACgkQCaWpQKGI+9Qq4QCdHAHNtgZBLfEUInpYMM8JNdyx
+1aoAn0rgxNuhzet+34pzCbo/7I5JoB1y
+=3+0l
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.13.90-TERM-gnome.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.13.90-TERM-gnome.patch
deleted file mode 100644
index cab27403ad5c..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.13.90-TERM-gnome.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/terminal-screen.c	2006-02-04 19:35:24.000000000 -0600
-+++ src/terminal-screen.c	2006-02-04 19:35:33.000000000 -0600
-@@ -1111,7 +1111,7 @@
-   retval[i] = g_strdup ("COLORTERM="EXECUTABLE_NAME);
-   ++i;
- 
--  retval[i] = g_strdup ("TERM=xterm"); /* FIXME configurable later? */
-+  retval[i] = g_strdup ("TERM=gnome"); /* FIXME configurable later? */
-   ++i;
- 
-   retval[i] = g_strdup_printf ("WINDOWID=%ld",
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch
deleted file mode 100644
index adc81ffa8f32..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-Index: src/terminal-accels.c
-===================================================================
---- src/terminal-accels.c	(revision 3169)
-+++ src/terminal-accels.c	(revision 3171)
-@@ -20,11 +20,14 @@
- 
- #include <string.h>
- 
-+#include <gdk/gdkkeysyms.h>
-+
- #include "terminal-accels.h"
- #include "terminal-app.h"
- #include "terminal-intl.h"
- #include "terminal-profile.h"
- #include "terminal-util.h"
-+#include "terminal-accels.h"
- 
- #ifdef DEBUG_ACCELS
- #define D(x) x
-@@ -71,6 +74,7 @@
- #define ACCEL_PATH_MOVE_TAB_LEFT        ACCEL_PATH_ROOT "TabsMoveLeft"
- #define ACCEL_PATH_MOVE_TAB_RIGHT       ACCEL_PATH_ROOT "TabsMoveRight"
- #define ACCEL_PATH_DETACH_TAB           ACCEL_PATH_ROOT "TabsDetach"
-+#define ACCEL_PATH_SWITCH_TAB_PREFIX    ACCEL_PATH_ROOT "TabsSwitch"
- 
- #define KEY_CLOSE_TAB           CONF_KEYS_PREFIX "/close_tab"
- #define KEY_CLOSE_WINDOW        CONF_KEYS_PREFIX "/close_window"
-@@ -93,6 +97,7 @@
- #define KEY_ZOOM_IN             CONF_KEYS_PREFIX "/zoom_in"
- #define KEY_ZOOM_NORMAL         CONF_KEYS_PREFIX "/zoom_normal"
- #define KEY_ZOOM_OUT            CONF_KEYS_PREFIX "/zoom_out"
-+#define KEY_SWITCH_TAB_PREFIX   CONF_KEYS_PREFIX "/switch_to_tab_"
- 
- typedef struct
- {
-@@ -173,6 +178,42 @@
-     KEY_MOVE_TAB_RIGHT, ACCEL_PATH_MOVE_TAB_RIGHT, 0, 0, NULL, FALSE, TRUE },
-   { N_("Detach Tab"),
-     KEY_DETACH_TAB, ACCEL_PATH_DETACH_TAB, 0, 0, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 1"),
-+    KEY_SWITCH_TAB_PREFIX "1",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "1", GDK_1, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 2"),
-+    KEY_SWITCH_TAB_PREFIX "2",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "2", GDK_2, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 3"),
-+    KEY_SWITCH_TAB_PREFIX "3",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "3", GDK_3, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 4"),
-+    KEY_SWITCH_TAB_PREFIX "4",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "4", GDK_4, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 5"),
-+    KEY_SWITCH_TAB_PREFIX "5",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "5", GDK_5, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 6"),
-+    KEY_SWITCH_TAB_PREFIX "6",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "6", GDK_6, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 7"),
-+    KEY_SWITCH_TAB_PREFIX "7",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "7", GDK_7, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 8"),
-+    KEY_SWITCH_TAB_PREFIX "8",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "8", GDK_8, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 9"),
-+    KEY_SWITCH_TAB_PREFIX "9",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "9", GDK_9, GDK_MOD1_MASK, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 10"),
-+    KEY_SWITCH_TAB_PREFIX "10",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "10", 0, 0, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 11"),
-+    KEY_SWITCH_TAB_PREFIX "11",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "11", 0, 0, NULL, FALSE, TRUE },
-+  { N_("Switch to Tab 12"),
-+    KEY_SWITCH_TAB_PREFIX "12",
-+    ACCEL_PATH_SWITCH_TAB_PREFIX "12", 0, 0, NULL, FALSE, TRUE }
- };
- 
- static KeyEntry help_entries[] = {
-@@ -186,7 +227,7 @@
-   { view_entries, G_N_ELEMENTS (view_entries), N_("View") },
-   { terminal_entries, G_N_ELEMENTS (terminal_entries), N_("Terminal") },
-   { tabs_entries, G_N_ELEMENTS (tabs_entries), N_("Tabs") },
--  { help_entries, G_N_ELEMENTS (help_entries), N_("Help") }
-+  { help_entries, G_N_ELEMENTS (help_entries), N_("Help") },
- };
- 
- enum
-Index: src/terminal-tabs-menu.c
-===================================================================
---- src/terminal-tabs-menu.c	(revision 3169)
-+++ src/terminal-tabs-menu.c	(revision 3171)
-@@ -30,14 +30,16 @@
- #include "terminal-screen-container.h"
- #include "terminal-intl.h"
- 
-+#define TERMINAL_ACCELS_N_TABS_SWITCH (12)
-+
- #define LABEL_WIDTH_CHARS 32
- #define ACTION_VERB_FORMAT_PREFIX       "JmpTab"
--#define ACTION_VERB_FORMAT_PREFIX_LEN   (6) /* strlen (ACTION_VERB_FORMAT_PREFIX) */
-+#define ACTION_VERB_FORMAT_PREFIX_LEN   strlen (ACTION_VERB_FORMAT_PREFIX)
- #define ACTION_VERB_FORMAT		ACTION_VERB_FORMAT_PREFIX "%x"
- #define ACTION_VERB_FORMAT_LENGTH	strlen (ACTION_VERB_FORMAT) + 14 + 1
- #define ACTION_VERB_FORMAT_BASE         (16) /* %x is hex */
--#define ACCEL_PATH_FORMAT		"<Actions>/TabsActions/%s"
--#define ACCEL_PATH_FORMAT_LENGTH	strlen (ACCEL_PATH_FORMAT) -2 + ACTION_VERB_FORMAT_LENGTH
-+#define ACCEL_PATH_FORMAT		"<Actions>/Main/TabsSwitch%u"
-+#define ACCEL_PATH_FORMAT_LENGTH	strlen (ACCEL_PATH_FORMAT) + 14 + 1
- #define DATA_KEY			"TerminalTabsMenu::Action"
- 
- #define UI_PATH                         "/menubar/Tabs"
-@@ -379,7 +381,7 @@
- 	g_type_class_add_private (object_class, sizeof (TerminalTabsMenuPrivate));
- 
-         /* We don't want to save accels, so skip them */
--        gtk_accel_map_add_filter ("<Actions>/TabsActions/JmpTab*");
-+        gtk_accel_map_add_filter ("<Actions>/Main/TabsSwitch*");
- }
- 
- static void
-@@ -416,40 +418,19 @@
- 			    guint tab_number,
- 			    gboolean is_single_tab)
- {
--	const char *verb;
--	char accel_path[ACCEL_PATH_FORMAT_LENGTH];
--	char accel[7];
--	gint accel_number;
--	guint accel_key;
--	GdkModifierType accel_mods;
-+        if (!is_single_tab &&
-+            tab_number < TERMINAL_ACCELS_N_TABS_SWITCH)
-+        {
-+                char accel_path[ACCEL_PATH_FORMAT_LENGTH];
- 
--	verb = gtk_action_get_name (action);
--
--	/* set the accel path for the menu item */
--	g_snprintf (accel_path, sizeof (accel_path),
--		    ACCEL_PATH_FORMAT, verb);
--	gtk_action_set_accel_path (action, accel_path);
--
--	/* Only the first ten tabs get accelerators starting from 1 through 0 */
--	if (tab_number < 10 && !is_single_tab)
--	{
--		accel_key = 0;
--		accel_number = (tab_number + 1) % 10;
--
--		g_snprintf (accel, sizeof (accel), "<alt>%d", accel_number);
--
--		gtk_accelerator_parse (accel, &accel_key, &accel_mods);
--
--		if (accel_key != 0)
--		{
--			gtk_accel_map_change_entry (accel_path, accel_key,
--						    accel_mods, TRUE);
--		}
--	}
--	else
--	{
--		gtk_accel_map_change_entry (accel_path, 0, 0, TRUE);
--	}
-+                g_snprintf (accel_path, sizeof (accel_path), ACCEL_PATH_FORMAT, tab_number + 1);
-+                gtk_action_set_accel_path (action, accel_path);
-+        }
-+        else
-+        {
-+                gtk_action_set_accel_path (action, NULL);
-+                return;
-+        }
- }
- 
- static void
-Index: src/gnome-terminal.schemas.in
-===================================================================
---- src/gnome-terminal.schemas.in	(revision 3169)
-+++ src/gnome-terminal.schemas.in	(revision 3171)
-@@ -916,6 +916,210 @@
-     </schema>
- 
-     <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_1</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_1</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;1</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 1</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 1. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_2</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_2</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;2</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 2</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 2. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_3</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_3</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;3</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 3</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 3. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_4</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_4</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;4</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 4</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 4. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_5</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_5</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;5</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 5</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 5. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_6</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_6</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;6</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 6</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 6. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_7</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_7</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;7</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 7</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 7. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_8</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_8</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;8</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 8</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 8. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_9</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_9</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+      <default>&lt;Alt&gt;9</default>
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 9</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 9. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_10</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_10</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+<!-- no default -->
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 10</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 10. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_11</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_11</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+<!-- no default -->
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 11</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 11. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-+      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_12</key>
-+      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_12</applyto>
-+      <owner>gnome-terminal</owner>
-+      <type>string</type>
-+<!-- no default -->
-+      <locale name="C">
-+         <short>Keyboard shortcut to switch to tab 12</short>
-+         <long>
-+          Keyboard shortcut key for switch to tab 12. Expressed as a string
-+          in the same format used for GTK+ resource files.
-+          If you set the option to the special string "disabled", then there
-+          will be no keyboard shortcut for this action.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-       <key>/schemas/apps/gnome-terminal/keybindings/help</key>
-       <applyto>/apps/gnome-terminal/keybindings/help</applyto>
-       <owner>gnome-terminal</owner>
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-cwd-on-new-tab.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-cwd-on-new-tab.patch
deleted file mode 100644
index d532dc0db088..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-cwd-on-new-tab.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-Author: Christian Persch
-Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=565328
-Date: 2009-04-22 18:33
-
----
-
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index e6dd61e..10deb3f 100644
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -183,6 +183,59 @@ static guint n_skey_regexes;
- 
- G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
- 
-+static char *
-+cwd_of_pid (int pid)
-+{
-+  static const char patterns[][18] = {
-+    "/proc/%d/cwd",         /* Linux */
-+    "/proc/%d/path/cwd",    /* Solaris >= 10 */
-+  };
-+  guint i;
-+  
-+  if (pid == -1)
-+    return NULL;
-+
-+  /* Try to get the working directory using various OS-specific mechanisms */
-+  for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
-+    {
-+      char cwd_file[64];
-+      char buf[PATH_MAX + 1];
-+      int len;
-+
-+      g_snprintf (cwd_file, sizeof (cwd_file), patterns[i], pid);
-+      len = readlink (cwd_file, buf, sizeof (buf) - 1);
-+
-+      if (len > 0 && buf[0] == '/')
-+        return g_strndup (buf, len);
-+
-+      /* If that didn't do it, try this hack */
-+      if (len <= 0)
-+        {
-+          char *cwd, *working_dir = NULL;
-+
-+          cwd = g_get_current_dir ();
-+          if (cwd != NULL)
-+            {
-+              /* On Solaris, readlink returns an empty string, but the
-+               * link can be used as a directory, including as a target
-+               * of chdir().
-+               */
-+              if (chdir (cwd_file) == 0)
-+                {
-+                  working_dir = g_get_current_dir ();
-+                  chdir (cwd);
-+                }
-+              g_free (cwd);
-+            }
-+
-+          if (working_dir)
-+            return working_dir;
-+        }
-+    }
-+
-+  return NULL;
-+}
-+
- static void
- free_tag_data (TagData *tagdata)
- {
-@@ -1738,75 +1791,57 @@ terminal_screen_get_dynamic_icon_title (TerminalScreen *screen)
-  * terminal_screen_get_current_dir:
-  * @screen:
-  *
-- * Returns: a newly allocated string containing the current working directory
-- *   of the foreground process in @screen's PTY; or otherwise the initial working
-- *   directory as set by terminal_screen_new()
-+ * Tries to determine the current working directory of the foreground process
-+ * in @screen's PTY, falling back to the current working directory of the
-+ * primary child.
-+ * 
-+ * Returns: a newly allocated string containing the current working directory,
-+ *   or %NULL on failure
-  */
- char*
- terminal_screen_get_current_dir (TerminalScreen *screen)
- {
--  static const char patterns[][18] = {
--    "/proc/%d/cwd",         /* Linux */
--    "/proc/%d/path/cwd",    /* Solaris >= 10 */
--  };
-   TerminalScreenPrivate *priv = screen->priv;
--  int fgpid;
--  guint i;
--  
--  g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
-+  char *cwd;
-+
-+  if (priv->pty_fd != -1) {
-+    /* Get the foreground process ID */
-+    cwd = cwd_of_pid (tcgetpgrp (priv->pty_fd));
-+    if (cwd != NULL)
-+      return cwd;
-+
-+    /* If that didn't work, try falling back to the primary child. See bug #575184. */
-+    cwd = cwd_of_pid (priv->child_pid);
-+    if (cwd != NULL)
-+      return cwd;
-+  }
- 
--  if (priv->pty_fd == -1)
--    return g_strdup (priv->initial_working_directory);
-+  return NULL;
-+}
- 
--  /* Get the foreground process ID */
--  fgpid = tcgetpgrp (priv->pty_fd);
-+/**
-+ * terminal_screen_get_current_dir_with_fallback:
-+ * @screen:
-+ *
-+ * Returns: a newly allocated string containing the current working directory
-+ *   of the foreground process in @screen's PTY; or otherwise the initial working
-+ *   directory as set by terminal_screen_new(), or %NULL if unable to determine
-+ *   the current working directory
-+ */
-+char*
-+terminal_screen_get_current_dir_with_fallback (TerminalScreen *screen)
-+{
-+  TerminalScreenPrivate *priv = screen->priv;
-+  char *cwd;
- 
--  /* If that didn't work, try falling back to the primary child. See bug #575184. */
--  if (fgpid == -1)
--    fgpid = priv->child_pid;
-+  cwd = terminal_screen_get_current_dir (screen);
-+  if (cwd != NULL)
-+    return cwd;
- 
--  if (fgpid == -1)
-+  if (priv->initial_working_directory != NULL)
-     return g_strdup (priv->initial_working_directory);
- 
--  /* Try to get the working directory using various OS-specific mechanisms */
--  for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
--    {
--      char cwd_file[64];
--      char buf[PATH_MAX + 1];
--      int len;
--
--      g_snprintf (cwd_file, sizeof (cwd_file), patterns[i], fgpid);
--      len = readlink (cwd_file, buf, sizeof (buf) - 1);
--
--      if (len > 0 && buf[0] == '/')
--        return g_strndup (buf, len);
--
--      /* If that didn't do it, try this hack */
--      if (len <= 0)
--        {
--          char *cwd, *working_dir = NULL;
--
--          cwd = g_get_current_dir ();
--          if (cwd != NULL)
--            {
--              /* On Solaris, readlink returns an empty string, but the
--               * link can be used as a directory, including as a target
--               * of chdir().
--               */
--              if (chdir (cwd_file) == 0)
--                {
--                  working_dir = g_get_current_dir ();
--                  chdir (cwd);
--                }
--              g_free (cwd);
--            }
--
--          if (working_dir)
--            return working_dir;
--        }
--    }
--
--  return g_strdup (priv->initial_working_directory);
-+  return g_strdup (g_get_home_dir ());
- }
- 
- void
-diff --git a/src/terminal-screen.h b/src/terminal-screen.h
-index efd5b3c..8b1e422 100644
---- a/src/terminal-screen.h
-+++ b/src/terminal-screen.h
-@@ -110,6 +110,7 @@ const char *terminal_screen_get_dynamic_title      (TerminalScreen *screen);
- const char *terminal_screen_get_dynamic_icon_title (TerminalScreen *screen);
- 
- char *terminal_screen_get_current_dir (TerminalScreen *screen);
-+char *terminal_screen_get_current_dir_with_fallback (TerminalScreen *screen);
- 
- void        terminal_screen_set_font (TerminalScreen *screen);
- void        terminal_screen_set_font_scale    (TerminalScreen *screen,
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 188bdd1..05e0af1 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2807,7 +2807,7 @@ file_new_window_callback (GtkAction *action,
- 
-   new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window)));
- 
--  new_working_directory = terminal_screen_get_current_dir (priv->active_screen);
-+  new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen);
-   terminal_app_new_terminal (app, new_window, profile,
-                              NULL, NULL,
-                              new_working_directory,
-@@ -2839,7 +2839,7 @@ file_new_tab_callback (GtkAction *action,
-   if (_terminal_profile_get_forgotten (profile))
-     return;
- 
--  new_working_directory = terminal_screen_get_current_dir (priv->active_screen);
-+  new_working_directory = terminal_screen_get_current_dir_with_fallback (priv->active_screen);
-   terminal_app_new_terminal (app, window, profile,
-                              NULL, NULL,
-                              new_working_directory,
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch
deleted file mode 100644
index 5e7e8b4a71cd..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixing bug #289361 with a patch based in Daniel Schömer one and upstream
-commit 712fd4ab3056439a553dd650153a382b94073fac by Philip Withnall
-This is solved by upstream in gnome-terminal > 2.30.1
-http://bugs.gentoo.org/show_bug.cgi?id=289361
-https://bugzilla.gnome.org/show_bug.cgi?id=617206
---- help/en_GB/en_GB.po~	2009-12-14 21:26:09.000000000 +0100
-+++ help/en_GB/en_GB.po	2010-04-30 09:02:08.000000000 +0200
-@@ -1167,7 +1167,7 @@
- 
- #: C/gnome-terminal.xml:670(guilabel)
- msgid "Disable menu shortcut key (F10 by default)"
--msgstr "Disable menu shortcut key (<keycap>F10</keycap> by default)"
-+msgstr "Disable menu shortcut key (F10 by default)"
- 
- #: C/gnome-terminal.xml:672(para)
- msgid ""
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch
deleted file mode 100644
index b6945651eb5f..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Partial fix for Gentoo bug 268846, upstream is not interested in a complete fix
-that allows gnome-terminal to work when gconf-daemon cannot be run.
-
---
-From f41c3d14bdfd533109d7d75bdbb2e2a0ab59b60c Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Thu, 13 Aug 2009 12:31:11 +0000
-Subject: Be more lenient in the gconf daemon check
-
-Using gconf_ping_daemon() wasn't working right, since it returns FALSE
-not only when the gconf daemon cannot be spawned, but also if the daemon
-simply isn't running yet, but could be started without problems. Use
-gconf_spawn_daemon() instead. Should fix problem reported in bug 564649
-comment 5.
----
-diff --git a/src/terminal.c b/src/terminal.c
-index 41285e5..fc0cb2b 100644
---- a/src/terminal.c
-+++ b/src/terminal.c
-@@ -236,8 +236,8 @@ get_factory_name_for_display (const char *display_name)
- }
- 
- /* Evil hack alert: this is exported from libgconf-2 but not in a public header */
--extern gboolean gconf_ping_daemon (void);
--         
-+extern gboolean gconf_spawn_daemon(GError** err);
-+
- int
- main (int argc, char **argv)
- {
-@@ -329,7 +329,7 @@ main (int argc, char **argv)
-     {
-       g_printerr ("Failed to get the session bus: %s\nFalling back to non-factory mode.\n",
-                   error->message);
--      g_error_free (error);
-+      g_clear_error (&error);
-       goto factory_disabled;
-     }
- 
-@@ -353,7 +353,7 @@ main (int argc, char **argv)
-                                           &error))
-     {
-       g_printerr ("Failed name request: %s\n", error->message);
--      g_error_free (error);
-+      g_clear_error (&error);
-       goto factory_disabled;
-     }
- 
-@@ -419,7 +419,7 @@ main (int argc, char **argv)
-             {
-               /* Incompatible factory version, fall back, to new instance */
-               g_printerr (_("Incompatible factory version; creating a new instance.\n"));
--              g_error_free (error);
-+              g_clear_error (&error);
- 
-               goto factory_disabled;
-             }
-@@ -449,10 +449,13 @@ factory_disabled:
-   /* If the gconf daemon isn't available (e.g. because there's no dbus
-    * session bus running), we'd crash later on. Tell the user about it
-    * now, and exit. See bug #561663.
-+   * Don't use gconf_ping_daemon() here since the server may just not
-+   * be running yet, but able to be started. See comments on bug #564649.
-    */
--  if (!gconf_ping_daemon ())
-+  if (!gconf_spawn_daemon (&error))
-     {
--      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
-+      g_printerr ("Failed to summon the GConf demon: %s\n", error->message);
-+      g_error_free (error);
-       exit (1);
-     }
- 
---
-cgit v0.8.2
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch
deleted file mode 100644
index 0358ed8a64d6..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001
-From: Seán de Búrca <leftmostcat@gmail.com>
-Date: Fri, 07 Aug 2009 00:38:52 +0000
-Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
-
----
-diff --git a/help/el/el.po b/help/el/el.po
-index ab77264..635b68f 100644
---- a/help/el/el.po
-+++ b/help/el/el.po
-@@ -10,7 +10,6 @@ msgstr ""
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: 2\n"
- "X-Poedit-Language: Greek\n"
- "X-Poedit-Country: GREECE\n"
- "X-Generator: Lokalize 0.2\n"
---
-cgit v0.8.3.1
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild
index 1bd4b710299b..1271cca3e886 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.0.ebuild,v 1.1 2010/10/20 20:52:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild,v 1.1 2010/11/19 22:17:31 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.18:2
 	>=gnome-base/gconf-2.31.3
-	>=x11-libs/vte-0.25.91
+	>=x11-libs/vte-0.26.0
 	x11-libs/libSM
 	gnome-base/libgnome"
 DEPEND="${RDEPEND}
@@ -36,9 +36,4 @@ src_prepare() {
 
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# Leave out for now; causing too many problems
-	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
 }