Bump to 3.0.1, from gnome overlay for GNOME 3

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 251 insertions, 5 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 588fe59c1112..bf9d517dfcab 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.237 2011/04/17 14:05:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.238 2011/08/19 14:35:28 nirbheek Exp $
+
+*gnome-terminal-3.0.1 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-terminal-2.33.5-remove-libgnome-dep.patch,
+  +gnome-terminal-3.0.1.ebuild:
+  Bump to 3.0.1, from gnome overlay for GNOME 3
 
   17 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-terminal-2.30.2.ebuild:
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index e3bcd942c5f9..edb4065bd047 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -2,14 +2,27 @@
 Hash: SHA1
 
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
+AUX gnome-terminal-2.33.5-remove-libgnome-dep.patch 6681 RMD160 89c30690d4dd8820c51b3bbd5403792daf5d895a SHA1 9d5c340c4a341d02033d16e9a8a78e63ce154135 SHA256 5785a90b92653bef79bb8fbfeb6339adf83730f8eb73ce5c731b72793dda66ae
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 RMD160 d381b468113bae89505436a931238e22f3f7794c SHA1 a4d803e4d372227f8a61ca3f5ed40391ff135adf SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
+DIST gnome-terminal-3.0.1.tar.bz2 2321517 RMD160 524c8939eb6bb9e6de9d5db25a131a7cfa779a95 SHA1 47b307a7b0b65cfbfae2eee67aafc47eb0f5e96a SHA256 388eda40663566cb785e2d92180e0b584c2c89acc3e7bcd30605601710fddc48
 EBUILD gnome-terminal-2.32.1.ebuild 1053 RMD160 80b7f1b8d8896e7fd69f10764ccff39c845a48fe SHA1 fa74918d8f681421f8eb3c99f679463c9419e84b SHA256 7ac8eb9c87f1157c065be2e213cc7f8820bf18c7867487f64f5c17de46a58f02
-MISC ChangeLog 33612 RMD160 d964707571e583198be5dec004b08f14d9a18505 SHA1 dfa8ae30f4a82a112e1487f54aa4cf6cdf2e4e15 SHA256 3347d5616024a1e37929a74d663b51d38e57971370ba4a07ddd2cbd7cde594d0
+EBUILD gnome-terminal-3.0.1.ebuild 1385 RMD160 379b728790e7e34ca03538616251875c438ab341 SHA1 84282924d70ada0cbc3eea1f6617d2b27fc70f8a SHA256 25bc0645d9c4222f6517b123eabbe85c5828bde3331cc26957ad66c2b005e9ee
+MISC ChangeLog 33847 RMD160 6c4c0b8a5705e5f00d7e9d2e2944593187baf43a SHA1 0635c7d2c807f910d00936531d48c0080e61f7be SHA256 62956658d0547566d1455c63ab4a6914db271fb9c32a0d85e91057c608519815
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2q85UACgkQ1fmVwcYIWAbD4QCgle9s+n36YCAg1wtS+7EmnKbw
-e5QAn2Zd9vuj8tUGSdKMA89X7o0YJgis
-=5bVb
+iQIcBAEBAgAGBQJOTnS8AAoJEO/kOhxWD91k7MEP/24yUKDMANXhAVKV7ovYc61z
+e752R+FF3/tBSg20YGf77Pf5MSzesCa1OQTiKGDrHWEHxCWacwBIVytG0m+yqaxM
+QvV9YZ9OBi44Uz3TAXo9TM7l2TtgY61z69VrgQhsGKyabX9N0xxfB97PFMgneXlo
++1Cd8B0lbtFe2bYrHq5wdzWI+zhw0CMJJvsiDsYlqqxqaMILzloeg24GZjk6xfY9
+C0AqysDorQ2iDMdRZ7AjQN02m5e5+1VPtwa4pZfOXMOa2Fw8EX9m5cHy+0lh7JUw
+dqs0kd1s9TBIs6gUE36lpTPIbL0veiyndypw19sySwLTfcnpCJoAhUGVNSiA9zKe
+Qri2b5n3hJ0ifJY5K9CdwsuUudCZO4gmLkXlLZt4I3kr+mFagGn4jJm44a+lRNgq
+B/QBsDqo0gD/XCEmN0cGxghvC1k27MJEp+ARXb8Lg90C13q+p+62Aotrwu5zbABG
+kcWCHEtydelXjN1VbXAAUXF9pdoTOo3QbUPaGd3erEdXKnngrK1y9V5AC7r8IHFg
+aawuEtMYWfiyiajsflNDhu1JUREar2Mm0AxBxL7DyDUv+9gx4GwiNbaBqXqRb650
+bspK0G9w7Cz5eQ7hGluh8ssxbEtJqUe9dFrvQPdf5MiN20M7aIvUOmbWA3nKenFr
+B9moKgv2g2iiK+xaQ4el
+=T3qm
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..fd69eae8e24e
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch
@@ -0,0 +1,173 @@
+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.0.1.ebuild
new file mode 100644
index 000000000000..8de3f5682dba
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.0.1.ebuild
@@ -0,0 +1,53 @@
+# 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 $
+
+EAPI="3"
+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
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	>=x11-libs/gtk+-3.0:3
+	>=x11-libs/vte-0.27.3:2.90
+	>=gnome-base/gconf-2.31.3
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	x11-libs/libSM
+	x11-libs/libICE"
+# gtk+:2 needed for gtk-builder-convert, bug 356239
+DEPEND="${RDEPEND}
+	x11-libs/gtk+:2
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.3.11
+	sys-devel/gettext"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# FIXME: leave smclient configure unset until it accepts values from the
+	# switch and not from GDK_TARGET, bug #363033
+	G2CONF="${G2CONF} --with-gtk=3.0"
+}
+
+src_prepare() {
+	# Use login shell by default (#12900)
+	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
+
+	gnome2_src_prepare
+}