Bump to 3.2.1 from the gnome overlay. Drop old. Remove unused patch.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

3 files changed, 12 insertions, 185 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index bf9d517dfcab..deeebbdf7f6e 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.238 2011/08/19 14:35:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.239 2011/10/30 02:01:30 tetromino Exp $
+
+*gnome-terminal-3.2.1 (30 Oct 2011)
+
+  30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gnome-terminal-2.33.5-remove-libgnome-dep.patch,
+  -gnome-terminal-3.0.1.ebuild, +gnome-terminal-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay. Drop old. Remove unused patch.
 
 *gnome-terminal-3.0.1 (19 Aug 2011)
 
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch
deleted file mode 100644
index fd69eae8e24e..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From e1ba3eea28f62c7b9b16a35b2d625aaf925f4802 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Thu, 3 Feb 2011 23:09:52 +0100
-Subject: [PATCH] Take system font from gsettings instead of gconf
-
-Bug #590774.
----
- configure.ac       |    2 ++
- src/terminal-app.c |   52 ++++++++++++++++++++--------------------------------
- 2 files changed, 22 insertions(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 50bc8f9..414c602 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -42,6 +42,7 @@ AM_GLIB_GNU_GETTEXT
- GLIB_REQUIRED=2.26.0
- GIO_REQUIRED=2.26.0
- GCONF_REQUIRED=2.31.3
-+GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.0
- 
- AC_MSG_CHECKING([which gtk+ version to compile against])
- AC_ARG_WITH([gtk],
-@@ -90,6 +91,7 @@ PKG_CHECK_MODULES([TERM],
-    gio-2.0 >= $GIO_REQUIRED
-    gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-    gconf-2.0 >= $GCONF_REQUIRED
-+   gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
-    $PLATFORM_DEPS])
- 
- # ********
-diff --git a/src/terminal-app.c b/src/terminal-app.c
-index 3db56d8..ed79541 100644
---- a/src/terminal-app.c
-+++ b/src/terminal-app.c
-@@ -49,6 +49,8 @@
- #endif
- 
- #define FALLBACK_PROFILE_ID "Default"
-+#define DESKTOP_INTERFACE_SETTINGS_SCHEMA       "org.gnome.desktop.interface"
-+#define MONOSPACE_FONT_KEY_NAME                 "monospace-font-name"
- 
- /* Settings storage works as follows:
-  *   /apps/gnome-terminal/global/
-@@ -97,10 +99,11 @@ struct _TerminalApp
-   guint profile_list_notify_id;
-   guint default_profile_notify_id;
-   guint encoding_list_notify_id;
--  guint system_font_notify_id;
-   guint enable_mnemonics_notify_id;
-   guint enable_menu_accels_notify_id;
- 
-+  GSettings *desktop_interface_settings;
-+
-   GHashTable *profiles;
-   char* default_profile_id;
-   TerminalProfile *default_profile;
-@@ -150,8 +153,6 @@ static TerminalApp *global_app = NULL;
- /* Evil hack alert: this is exported from libgconf-2 but not in a public header */
- extern gboolean gconf_spawn_daemon(GError** err);
- 
--#define MONOSPACE_FONT_DIR "/desktop/gnome/interface"
--#define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name"
- #define DEFAULT_MONOSPACE_FONT ("Monospace 10")
- 
- #define ENABLE_MNEMONICS_KEY CONF_GLOBAL_PREFIX "/use_mnemonics"
-@@ -963,26 +964,14 @@ terminal_app_encoding_list_notify_cb (GConfClient *client,
- }
- 
- static void
--terminal_app_system_font_notify_cb (GConfClient *client,
--                                    guint        cnxn_id,
--                                    GConfEntry  *entry,
--                                    gpointer     user_data)
-+terminal_app_system_font_notify_cb (GSettings   *settings,
-+                                    const char  *key,
-+                                    TerminalApp *app)
- {
--  TerminalApp *app = TERMINAL_APP (user_data);
--  GConfValue *gconf_value;
-   const char *font = NULL;
-   PangoFontDescription *font_desc;
- 
--  if (strcmp (gconf_entry_get_key (entry), MONOSPACE_FONT_KEY) != 0)
--    return;
--
--  gconf_value = gconf_entry_get_value (entry);
--  if (gconf_value &&
--      gconf_value->type == GCONF_VALUE_STRING)
--    font = gconf_value_get_string (gconf_value);
--  if (!font)
--    font = DEFAULT_MONOSPACE_FONT;
--  g_assert (font != NULL);
-+  g_settings_get (settings, MONOSPACE_FONT_KEY_NAME, "&s", &font);
- 
-   font_desc = pango_font_description_from_string (font);
-   if (app->system_font_desc &&
-@@ -1390,6 +1379,16 @@ terminal_app_init (TerminalApp *app)
- 
-   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
- 
-+  /* Terminal global settings */
-+  app->desktop_interface_settings = g_settings_new (DESKTOP_INTERFACE_SETTINGS_SCHEMA);
-+  terminal_app_system_font_notify_cb (app->desktop_interface_settings,
-+                                      MONOSPACE_FONT_KEY_NAME,
-+                                      app);
-+  g_signal_connect (app->desktop_interface_settings,
-+                    "changed::" MONOSPACE_FONT_KEY_NAME,
-+                    G_CALLBACK (terminal_app_system_font_notify_cb),
-+                    app);
-+
-   /* Initialise defaults */
-   app->enable_mnemonics = DEFAULT_ENABLE_MNEMONICS;
-   app->enable_menu_accels = DEFAULT_ENABLE_MENU_BAR_ACCEL;
-@@ -1403,9 +1402,6 @@ terminal_app_init (TerminalApp *app)
-   gconf_client_add_dir (app->conf, CONF_GLOBAL_PREFIX,
-                         GCONF_CLIENT_PRELOAD_ONELEVEL,
-                         NULL);
--  gconf_client_add_dir (app->conf, MONOSPACE_FONT_DIR,
--                        GCONF_CLIENT_PRELOAD_ONELEVEL,
--                        NULL);
-   gconf_client_add_dir (app->conf, CONF_PROXY_PREFIX,
-                         GCONF_CLIENT_PRELOAD_ONELEVEL,
-                         NULL);
-@@ -1430,12 +1426,6 @@ terminal_app_init (TerminalApp *app)
-                              terminal_app_encoding_list_notify_cb,
-                              app, NULL, NULL);
- 
--  app->system_font_notify_id =
--    gconf_client_notify_add (app->conf,
--                             MONOSPACE_FONT_KEY,
--                             terminal_app_system_font_notify_cb,
--                             app, NULL, NULL);
--
-   app->enable_mnemonics_notify_id =
-     gconf_client_notify_add (app->conf,
-                              ENABLE_MNEMONICS_KEY,
-@@ -1452,7 +1442,6 @@ terminal_app_init (TerminalApp *app)
-   gconf_client_notify (app->conf, PROFILE_LIST_KEY);
-   gconf_client_notify (app->conf, DEFAULT_PROFILE_KEY);
-   gconf_client_notify (app->conf, ENCODING_LIST_KEY);
--  gconf_client_notify (app->conf, MONOSPACE_FONT_KEY);
-   gconf_client_notify (app->conf, ENABLE_MENU_BAR_ACCEL_KEY);
-   gconf_client_notify (app->conf, ENABLE_MNEMONICS_KEY);
- 
-@@ -1504,15 +1493,12 @@ terminal_app_finalize (GObject *object)
-     gconf_client_notify_remove (app->conf, app->default_profile_notify_id);
-   if (app->encoding_list_notify_id != 0)
-     gconf_client_notify_remove (app->conf, app->encoding_list_notify_id);
--  if (app->system_font_notify_id != 0)
--    gconf_client_notify_remove (app->conf, app->system_font_notify_id);
-   if (app->enable_menu_accels_notify_id != 0)
-     gconf_client_notify_remove (app->conf, app->enable_menu_accels_notify_id);
-   if (app->enable_mnemonics_notify_id != 0)
-     gconf_client_notify_remove (app->conf, app->enable_mnemonics_notify_id);
- 
-   gconf_client_remove_dir (app->conf, CONF_GLOBAL_PREFIX, NULL);
--  gconf_client_remove_dir (app->conf, MONOSPACE_FONT_DIR, NULL);
- 
-   g_object_unref (app->conf);
- 
-@@ -1524,6 +1510,8 @@ terminal_app_finalize (GObject *object)
- 
-   pango_font_description_free (app->system_font_desc);
- 
-+  g_object_unref (app->desktop_interface_settings);
-+
-   terminal_accels_shutdown ();
- 
-   G_OBJECT_CLASS (terminal_app_parent_class)->finalize (object);
--- 
-1.7.3.4
-
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.0.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild
index 8de3f5682dba..dec9b6710e0d 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.0.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.0.1.ebuild,v 1.1 2011/08/19 14:35:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild,v 1.1 2011/10/30 02:01:30 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gtk+-3.0:3
-	>=x11-libs/vte-0.27.3:2.90
+	>=x11-libs/vte-0.30.0:2.90
 	>=gnome-base/gconf-2.31.3
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	x11-libs/libSM