Missing gdbus-codegen DEPEND (#537874 by Jan Vesely), apply some upstream patches for 3.14.x branch, drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 222 insertions, 77 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 09d6bad66f47..67c420a6424b 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.294 2015/01/23 09:35:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.295 2015/01/26 17:47:05 pacho Exp $
+
+*gnome-terminal-3.14.2-r2 (26 Jan 2015)
+
+  26 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-terminal-3.14.2-fix-crash.patch,
+  +files/gnome-terminal-3.14.2-title-option.patch,
+  +gnome-terminal-3.14.2-r2.ebuild, -gnome-terminal-3.14.2-r1.ebuild,
+  -gnome-terminal-3.14.2.ebuild:
+  Missing gdbus-codegen DEPEND (#537874 by Jan Vesely), apply some upstream
+  patches for 3.14.x branch, drop old
 
 *gnome-terminal-3.14.2-r1 (23 Jan 2015)
 
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index a8ff965b6e2d..31a205ce7bab 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -7,17 +7,18 @@ AUX gnome-terminal-3.12.0-remove-set-title-feature-0.patch 5613 SHA256 9288c88b0
 AUX gnome-terminal-3.12.0-remove-set-title-feature-1.patch 8886 SHA256 75b99525a8bd7cba13c25069dd549ac9492a6423a15b99ed2713a9a9a217c2bb SHA512 4e32e85b6b4601fca23e723f999376437eaf82e4bfdd98ac79bd3a590b0d6cadfe29755e1cfb434f15fb68abe240dd3e5ea55f8724c00ac8bc229556e69e3305 WHIRLPOOL eafe812c320a19655b3f5c7ffc7e147c9daa64cc87b00e09f791d2a056ed41c988f1a5a6e45d547466881d3270c6a505c4b7a8f03e00b300b8de17740620ddbf
 AUX gnome-terminal-3.12.0-remove-set-title-feature-2.patch 10871 SHA256 6871c5372b0f9af73cce4e816dd75e077f717b1030c4be0416b912ffb4e965d3 SHA512 97dedb17d542f18ab6280cbfe16bbeeb77b8f9b1761898f50e471d091ec445229c83d9f07960a34011c3d32d316c898e1d3846c8d6c847b92ea95aac7d00d248 WHIRLPOOL b611cc240664068d5f772658a28ef2f330dd4e5ae8ec8ef865c551f60da9e74fe7b317842bd56551ad7cd1e69b0698943cb2b7be67bfe0928bc3267efe39f682
 AUX gnome-terminal-3.12.0-remove-set-title-feature-3.patch 5952 SHA256 ef6d829de0e87ccc1784ce437cc98ded1322ee6dcd6fd23deebe170ef6eade26 SHA512 a80dd10f5f0c2b0da4bfde579e38197958dd8de746fa19d634f2e10fc54e7f60e56c47eb2448ee166758d7c7b196af21c4f4859d5fd27cfef856bc1b50670da3 WHIRLPOOL 2aa15816a19c3f663c908a8aba0652292a5c19be5f29d9aa25696bc2368c578ac7f44fca0f8ec4139e89f6f2caa4def38ab769e38616e0ac5034549500e4d183
+AUX gnome-terminal-3.14.2-fix-crash.patch 832 SHA256 19dbb2ac1cd5ce46106570678cd65dc3a76e3fdbcad87d22bfa12d4612075bc2 SHA512 649c9da52650b9d6a59989fd5dfcf763dac0a37b695c593539d3e483f8c986ca17da33647fc3dc83513b38a254c5202af7f4fca073129074c0e4f029e4c9f7ec WHIRLPOOL 59d517ef092463738490105a4953d0cabb3ebac4cd3d8f9895d1f6753996ad14c916a8e46b097d9a09f7a4021465029cf470ea64d3e81d3285670bdc190bc932
+AUX gnome-terminal-3.14.2-title-option.patch 6329 SHA256 0ea6adbf45632b42942f15f58666414ff65c9e9fc85a0293b6cba9d4909c2fd4 SHA512 cbc641c6c3e822e29db2d5b18f979d942f59de279e2453c800ee043eedbc68f4682ca6d53428a2394ef650ac654e5077641fa19b68cd841fb3c68d273198b3f2 WHIRLPOOL e4a415a1d4b0d26f6804f1410952eb55e064bc38981c716b8f55ef54e13890ebfad6501f2fe4a163b0654d02b5d56045267c5093569ea2a3aa6d8d86bb1e321a
 DIST gnome-terminal-3.12.3.tar.xz 1720988 SHA256 8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528 SHA512 b155600483129c0e592d0a9604fd7826f2f41633bebf9df5ed459b12c154d3f1e505b10a93e129c22b24215b7cdaa97acac9c4897a85256553fda1394e76ac48 WHIRLPOOL 6fbd2cd546e45a95a37493443c7e34c73dd17b39884882ff4cc4a46b4c5d189d7601f35b2f0ad39535c9693f55b84a9d46bc1d3a8404537dc0d5c26b415e5e0f
 DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f
 EBUILD gnome-terminal-3.12.3.ebuild 2342 SHA256 703a02a87f974b44e7a28f4b30c280cc0512f195259f6764e7029a8cd315e529 SHA512 e3356625d0a24444c02fda9664af13bdcb2f1e815c31272dcf1e09ac56d07a363e0804cbd703f828a4a15dea760b8e33205a4a2e4eb17ea67d04b6c2c0bd489f WHIRLPOOL 37d13812b9c64f0eca03fd37c704f89f2c9b5e4563ec2dd0ff4a8f19b4d072f3eea80e48889076fe59bdfe4030f3254073ee28a0aef40773b6b1ce1d4233fc4c
-EBUILD gnome-terminal-3.14.2-r1.ebuild 1846 SHA256 13aa35d87804539d7a978fe5660bbacb765d2cc08114f45e6f4931092b46f6e4 SHA512 36e167eb7bb969ad5d66112f14998c8b075c55cc718ffdb90d3b9361d30ec56ab1b545190265c66d5598757e89e22ba75166069f92d0e9edae67fd2c4de00e62 WHIRLPOOL 2bf7c14bfaa1201e076746524910be255a9bc68eac8d94532c57ff5ce101dc614535ac1b7ab00a1c7afbd1faa2d35b53dcafb42b97f9b74dddcddc20282516a0
-EBUILD gnome-terminal-3.14.2.ebuild 1861 SHA256 8639ed56446a596a5f88af4ba562baa452b4bb477adffad48d78e78fd42c19ab SHA512 4b661d09f35267fa9d2f997d947bc7369b354094af709f1db65dfa1cc2d9537db261d2244062cb7fb968c04b1dd43caf8cfe06ae7271573720b18558fd027dec WHIRLPOOL ebaf5b2a94837dcbbaada9fd10a37d2c3e3376d48f9df1804256e00d783e8b9d91d8e4341f75c4bf0597a3ab4660bb322c757004b98607b617fabdb72e7fea47
-MISC ChangeLog 43551 SHA256 75a48793d2c05be6bd5d27998225eb72736b65f972630e8260aa9e8982ee11c1 SHA512 0d885922bd4c8cb59bcd0a7b47df0748438a81ca1e2cf829d2c2da0ea7d2c4e92799b06d262413f6a88caf0f86ef1e4ba4003cc453512c808c3d3bde2f352c25 WHIRLPOOL 505729437534104de84582bfeb3de73249eef92344224765bef906447a50f299d6c2b9828857e37824d9893eb1ac47d55bd90dcb67e2579a639841db9a88f010
+EBUILD gnome-terminal-3.14.2-r2.ebuild 2127 SHA256 1cb2852b4101a4b7479fb112a15bd81d16c8c186f1b5ade1fbdb85013d0eb59e SHA512 0e6d2dad0a49c8f27083548835b39dc7727a87f7adbf888020210f2d0dbf6caa6919dbfdbe8e91564a0ebfad51debcd6cb3ae09755e33682aac76edf14d7f242 WHIRLPOOL cb6e17e1076c07b1c345115ae1da0c559cf0171e069f833bd5a68ccca3981623ef7d7da1733154e4eba0b2e92d251aae57c712940510f4273c74933b0ac8e602
+MISC ChangeLog 43955 SHA256 b91f34dff3c5474ed46b579508b5339fc6d39a920152cba1c44d218f55fb7a2c SHA512 1c357cb43e106bf7f4b1d69f728aab5c648cdf7c051042b6949278caac3d2ddf14112de638d3a19f8e8b3d26e7673ce30c0869508e7be446a18246884e8a9c7a WHIRLPOOL 0097703ce83bdb3848d8dd3ced825957535ad723235a9e4376385ddfecd496b9ac89763eabdb1b53938a9d9434fc6d486e192baee78252e0f20e4f9fa795bc16
 MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTCFe4ACgkQCaWpQKGI+9RPKQCfSFjJWSo7f3Vn+/WEFY/2LbG0
-jW8An0Ng2snwfAqNFspbl9QQ+xdW+s6N
-=Qchh
+iEYEAREIAAYFAlTGfZoACgkQCaWpQKGI+9SCcgCfa5d2Iql+x+w0XbBpCorLdFv4
+cNcAnAm8Fpbs+87ZPdjii7YTp4D8epo1
+=eYux
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
new file mode 100644
index 000000000000..40ddbc0e2d8f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
@@ -0,0 +1,26 @@
+From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont@gmail.com>
+Date: Thu, 8 Jan 2015 14:33:13 +0100
+Subject: screen: Fix crash with empty child process command line
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742560
+(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e)
+
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index ad78388..9f63239 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
+   if (process_name)
+     gs_transfer_out_value (process_name, &name);
+ 
+-  for (i = 0; i < len - 1; i++)
++  if (len > 0 && data[len - 1] == '\0')
++    len--;
++  for (i = 0; i < len; i++)
+     {
+       if (data[i] == '\0')
+         data[i] = ' ';
+-- 
+cgit v0.10.1
+
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
new file mode 100644
index 000000000000..1e3ddd3d94b4
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
@@ -0,0 +1,166 @@
+From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 15 Nov 2014 21:11:08 +0100
+Subject: client: Hide obsolete --title option
+
+Accept it for compatibility, but ignore it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740188
+(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123)
+
+diff --git a/src/gterminal.vala b/src/gterminal.vala
+index cf1ffae..7e55678 100644
+--- a/src/gterminal.vala
++++ b/src/gterminal.vala
+@@ -233,7 +233,6 @@ namespace GTerminal
+ 
+     public static string? working_directory = null;
+     public static string? profile = null;
+-    public static string? title = null;
+     public static double zoom = 1.0;
+ 
+     private static bool option_profile (string option_name,
+@@ -269,8 +268,6 @@ namespace GTerminal
+       { "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile,
+         N_("Use the given profile instead of the default profile"),
+         N_("UUID") },
+-      { "title", 0, 0, OptionArg.STRING, ref title,
+-        N_("Set the terminal title"), N_("TITLE") },
+       { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory,
+         N_("Set the working directory"), N_("DIRNAME") },
+       { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom,
+@@ -418,7 +415,7 @@ namespace GTerminal
+                                                     OpenOptions.geometry,
+                                                     OpenOptions.role,
+                                                     OpenOptions.profile,
+-                                                    OpenOptions.title,
++                                                    null /* title */,
+                                                     OpenOptions.maximise,
+                                                     OpenOptions.fullscreen);
+     if (OpenOptions.show_menubar_set)
+diff --git a/src/terminal-options.c b/src/terminal-options.c
+index 75fc64d..0280f11 100644
+--- a/src/terminal-options.c
++++ b/src/terminal-options.c
+@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */)
+ 
+   it->profile = profile;
+   it->exec_argv = NULL;
+-  it->title = NULL;
+   it->working_dir = NULL;
+   it->zoom = 1.0;
+   it->zoom_set = FALSE;
+@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it)
+ {
+   g_free (it->profile);
+   g_strfreev (it->exec_argv);
+-  g_free (it->title);
+   g_free (it->working_dir);
+   g_slice_free (InitialTab, it);
+ }
+@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name,
+ }
+ 
+ static gboolean
+-option_title_callback (const gchar *option_name,
+-                       const gchar *value,
+-                       gpointer     data,
+-                       GError     **error)
+-{
+-  TerminalOptions *options = data;
+-
+-  if (options->initial_windows)
+-    {
+-      InitialTab *it = ensure_top_tab (options);
+-
+-      g_free (it->title);
+-      it->title = g_strdup (value);
+-    }
+-  else
+-    {
+-      g_free (options->default_title);
+-      options->default_title = g_strdup (value);
+-    }
+-
+-  return TRUE;
+-}
+-
+-static gboolean
+ option_working_directory_callback (const gchar *option_name,
+                                    const gchar *value,
+                                    gpointer     data,
+@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory,
+   options->initial_windows = NULL;
+   options->default_role = NULL;
+   options->default_geometry = NULL;
+-  options->default_title = NULL;
+   options->zoom = 1.0;
+   options->zoom_set = FALSE;
+ 
+@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options,
+ /*          it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL);
+           it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/
+           it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL);
+-          it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL);
+ 
+           if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) &&
+               !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error)))
+@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options)
+   g_free (options->default_role);
+   g_free (options->default_geometry);
+   g_free (options->default_working_dir);
+-  g_free (options->default_title);
+   g_free (options->default_profile);
+ 
+   g_strfreev (options->exec_argv);
+@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options)
+     {
+       "title",
+       't',
+-      0,
++      G_OPTION_FLAG_HIDDEN,
+       G_OPTION_ARG_CALLBACK,
+-      option_title_callback,
+-      N_("Set the terminal title"),
+-      N_("TITLE")
++      unsupported_option_callback,
++      NULL, NULL
+     },
+     {
+       "working-directory",
+diff --git a/src/terminal-options.h b/src/terminal-options.h
+index a1e645b..17f42b4 100644
+--- a/src/terminal-options.h
++++ b/src/terminal-options.h
+@@ -75,7 +75,6 @@ typedef struct
+   char    *default_role;
+   char    *default_geometry;
+   char    *default_working_dir;
+-  char    *default_title;
+   char   **exec_argv;
+   char    *default_profile;
+   gboolean default_profile_is_id;
+@@ -95,7 +94,6 @@ typedef struct
+   char *profile;
+   gboolean profile_is_id;
+   char **exec_argv;
+-  char *title;
+   char *working_dir;
+   double zoom;
+   guint zoom_set : 1;
+diff --git a/src/terminal.c b/src/terminal.c
+index 2dd5a6d..b6a6f5e 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory,
+                                                           iw->geometry,
+                                                           iw->role,
+                                                           it->profile ? it->profile : options->default_profile,
+-                                                          it->title ? it->title : options->default_title,
++                                                          NULL /* title */,
+                                                           iw->start_maximized,
+                                                           iw->start_fullscreen);
+ 
+-- 
+cgit v0.10.1
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
index 54aac5ca1987..f444ef361f53 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.14.2-r1.ebuild,v 1.1 2015/01/23 09:35:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.1 2015/01/26 17:47:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
 	dev-util/appdata-tools
+	dev-util/gdbus-codegen
 	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
@@ -43,6 +44,16 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
 	tab you will need to add the following line to your ~/.bashrc:\n
 	. /etc/profile.d/vte.sh"
 
+src_prepare() {
+	# client: Hide obsolete --title option (from '3.14')
+	epatch "${FILESDIR}/${P}-title-option.patch"
+
+	# screen: Fix crash with empty child process command line (from '3.14')
+	epatch "${FILESDIR}/${P}-fix-crash.patch"
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild
deleted file mode 100644
index 99455f428dbd..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 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.14.2.ebuild,v 1.1 2014/12/23 23:31:46 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.10:3[X]
-	>=x11-libs/vte-0.38:2.91
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gconf-2.31.3
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	x11-libs/libSM
-	x11-libs/libICE
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/appdata-tools
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-	tab you will need to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte.sh"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-migration \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension) \
-		VALAC=$(type -P true)
-		# Docs are broken in this release.
-		#ITSTOOL=$(type -P true) \
-		#XMLLINT=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}