Bump to the first official release that works with gdl-3.6.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 24 insertions, 286 deletions

diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog
index f8ab9cfd58da..3f07f0e9c951 100644
--- a/app-text/gtranslator/ChangeLog
+++ b/app-text/gtranslator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/gtranslator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.56 2012/12/17 08:20:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.57 2012/12/30 00:07:33 tetromino Exp $
+
+*gtranslator-2.91.6 (29 Dec 2012)
+
+  29 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gtranslator-2.91.5-r2.ebuild, -files/gtranslator-2.91.5-gdl-3.6-1.patch,
+  -files/gtranslator-2.91.5-gdl-3.6-2.patch,
+  -files/gtranslator-2.91.5-gdl-3.6-3.patch, +gtranslator-2.91.6.ebuild:
+  Bump to the first official release that works with gdl-3.6.
 
 *gtranslator-2.91.5-r2 (17 Dec 2012)
 
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 45b22ea92a62..0f0e2a9af2f5 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -2,24 +2,22 @@
 Hash: SHA256
 
 AUX gtranslator-1.9.13-desktop-database.patch 1375 SHA256 703c1308d8afc1d79c10039c33705b5b241ca5ae377f88e9331f4f9f38d65cc3 SHA512 f8927a52a3b962ce9111f1654831caf2cb951d43b21a1d5f16537916720f1dd209ac46c84bc2663b5336f570f0ba21c879d6e951147c9e5b8d6089a23c0a8147 WHIRLPOOL ef09c2ffbd605b952fce635bc1438d2369fe1b6aac6c97744c128bb3e009cbc96459cfd83c08a78fc64cac2fa26532fb6c56d3f924a368426d3bceac15364299
-AUX gtranslator-2.91.5-gdl-3.6-1.patch 6047 SHA256 e4d8c5b1b69454b19f9458a3bff74e059738d8c9e246a79b48b6ffd0a92f899e SHA512 e74aee912b8cef1906cac0253fdfe2673c666997777f8f9d62ced759d915822a783cbf4530990df13c15d0fa47e463d28d03752c09bb08e66479f6e95d0d070d WHIRLPOOL 50b3f3ff8ee65fcb6f5b2839de1f6a5a4acf436c57967d562f37188d52e47b0bd744152bc1717aafa8bb5902eadf47c73decee63d065272bc206024099bc6a72
-AUX gtranslator-2.91.5-gdl-3.6-2.patch 4387 SHA256 1f33980a33a34c4e17d7662e1ebc6be8a8989acdce051e016bf0bffef0d4432f SHA512 5d1173e6ddc05d53b0cbbafab81e2a329bf3316e7a2a8e6064b071d5de19185984b71dc95a52c3e23d083db44a89687f1fef71aced58cffcc7e464deda60c127 WHIRLPOOL bcc6dc1d812bce3b72ad1540f6e89f1fbadcc3272a065fb0052ca1818eac0f3c569b1bccfe029f31366602b213c8eb08aed6772ea6116afcf5a6f47c7da59be2
-AUX gtranslator-2.91.5-gdl-3.6-3.patch 1714 SHA256 817175909ed9e89b7f03eaf52ab594b8ecad9caa2d596018d18d82e5a3efa8bd SHA512 d51570dbd79dcc14de7cd8f19faa46f82716c845e6f62d13e98013a112c09afa6d537ddf0d1b7d082592adb936f3c65ea4a4ff72d1e4c049094a20575fe6261f WHIRLPOOL 40c2de3265295b193b73afd6615b861821531e304e961ab3b91d4a3433543c82d90badc8eb1fece90099ae850a7fc4b583a322947a353f8c83955b0deb94da8a
 DIST gtranslator-1.9.13.tar.bz2 4655865 SHA256 c0b371b81630cf2e4efb6968c20f7580c62c34d9161c852a5d008622cd91408e SHA512 67f3394257736b3a21074d4b939a967994f272d0d7edbbc28729521a7e378667b50cc1ecf0172c3cd913b6d7b64a12cf398e6ea58b4ddaeb691fc48619753981 WHIRLPOOL 6948b6fa04477af5c3569dd92c8f51ae24f878ea4f2ae0d8260932fbc28ff2a84695d99c7858a5502794a6498eca357495e0d69988d1ff3b19a7f8e9b39bed7c
 DIST gtranslator-2.91.5.tar.xz 4559540 SHA256 7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6 SHA512 4475125a57c3ff9dcb2ce222b818cde5faf9729fbc1c9fb29933a4149afa9986eb6c12711cd9306faba1e5d20cc88ea99baaa88801f22cdc563238928eb4e88b WHIRLPOOL fd8722e7a129367d8260d1c59668002825ed3436d3ca7afce4490a360793541a357341b5a71034dd27aea31bae0d8bea4a718d08a6732dfde79f0b0969b7d18e
+DIST gtranslator-2.91.6.tar.xz 2235796 SHA256 a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6 SHA512 5cb5ca318201a08b530390073a9e87be93c6fb30629e899d6d23e38a790771cacf5188a26c61584a24170a3a12e9d1670440fd3f4eb3eab2da1a76a7ec4c385f WHIRLPOOL 6241316e3b759f4d21934ca9fce06cb2e3019288d3916957b5316112eab66fea3674c4b83974afdbdc19c905da86cd65939f83e9862414b2383b8a4f397d1659
 EBUILD gtranslator-1.9.13.ebuild 1817 SHA256 ce30dc850cf15f8d078851cfdb52215b16c8600443e31a9eaf31a9237e9c2328 SHA512 ef6dc8206fa134e1671f64ead86a68432190a8272def232dbe0894f55b10d68d5341dd83b9374c08c5507e2e1648cea839006322c4e489bf25494a54dbec1bf1 WHIRLPOOL 60d834cb4b68c30aff6bccadefafb277b3c7906f5089f5a4f2de75abebc53cf732fc1d582925dd086f081edcf40b28df9f0240bb93b9bc407c9107dfbd2376d2
-EBUILD gtranslator-2.91.5-r2.ebuild 2033 SHA256 70ddfed01e7420829f44d05794d8acf746902fe3cc273a0476e2f432eff0fb46 SHA512 eb33cb7bf7d27d84366cf67ddbef07f17617f3a4e36c34a6546a9154938b2cf641f99aedc64f2ef3661219d15386e78287db43a944f3d315843c6a42122aa4ec WHIRLPOOL e9d2ca4aee548885b46d000b0ad4682a3bbeeb64fc911825bd1c3104daab75345b377584758ab4e0d079fb5c665758722a745b9767b59c9c92d8667900dfb2a5
 EBUILD gtranslator-2.91.5.ebuild 2246 SHA256 cffe1fa55bf41ad11399aacce20af94744bf5ea5ece7c13b274cb6afb6283a80 SHA512 66a32dd4c1f62dc6326e762d7ee0deaeef88b60389f258407ce9504ee2940ebf310a035fd53ed19a691591a4f520d1006651092eef55662c972255b117d31bfd WHIRLPOOL bc166b01f497187e4bde79417b5b0845d6fe65c7c3ca2259432aa3a5019c7507473e284419abd26fb8fb8bf32f80c942425eb8d237316ce4742704b5effe67c9
-MISC ChangeLog 8475 SHA256 0b1b40aca3ce284ab8d2cd5c61073572e2f59b77dd4959b1b768e6725b408e58 SHA512 c037df0faae1fa076e8cbe2f8cbf3ce4b3277902f2e6d86979de697ef9f9c57a9f2a119fc577216026dde953ab469e2490688cfc5dd2b98004c1917353e8de28 WHIRLPOOL 1785a04cbdd44d265fedd9baea497ec73f8be5538e6543f0e84eb4fb566f851e55e40141057735806b6358f9870aa92520eaaff43a71053603965c6488eab09f
+EBUILD gtranslator-2.91.6.ebuild 1918 SHA256 4b0d268747428774aabc4f08587a489dc429c980f996d19cffba0ab567526644 SHA512 99133dfff5d9419ed1d4eb3b496298779cb8a66f1f74d908aac389368fcc8afaec4e8d18fcd0a386857226dd8ede285c4b11589dcae5bbb72f587102716c70cd WHIRLPOOL 7bbf2fa3998aa689f55ade76b217f5d003eeca3ba5a356afa4e84fefc5fd6bcb1caa9f1d0d6e8f8b93248172dc03462205b028bf635492aaf98d9f503ebc9a24
+MISC ChangeLog 8826 SHA256 6d693034a938d9a44b8f9fea6a14b147e223de4f483b9fefc5a06c8b80adac01 SHA512 be9eabfb2ba9ff66e58f680e7e9464581a561f08ae05e4883b195cacbd00e17cbaf56d33c9285500ee769879757af87d157d4d89da6fcc58c7af1063e6dd37eb WHIRLPOOL 505d5864dc082d6100226ef521ba0bc2603e6495a33265e6e0da7d394ac7abd4a85f7ed94837b092a80a7948f9f4d97533165c49466235060162f7291a2575d9
 MISC metadata.xml 276 SHA256 ca0f4d21839ee08ead7762f87786e0862800abc51eb3de256d2b265d355f2661 SHA512 896052fb7e24e8628e1e0cdb728dfae0bedced3fbc5c4ed3c194ad705463e360b6aff1d1d4985de52d491222fae238756b8897dcfbddc2d834903a6c8301b0a1 WHIRLPOOL 4d01e7b7e980e1feaac47946c3ee8e35a665af9e31757cf3c37c223b9e4b0d4fcf34c3a28c381fc933fce898e7c17a0d0050f6a8b73f4ab2fac8f8ff376137bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQztXBAAoJEJ0WA1zPCt1hBIkH/0NqEa/+XiNfFtNa45DlyLav
-mXBetY4TCr2B0ls6pZLIdfSgB5c4MMYpewGGreBN0lOzFfXCsJW8SsoCDUDERIyp
-MbL6Gv0v6zME8LWVu7avlerthy6M2iTGXGkEqkdmqLDBq2od5YjhMTYeNvfwhrU3
-xZYJIM5g6KM/+tKWvhfK5LAqK1wgwaixSwOJDLx75NbhD51cvYQ72TnZIjLxLBds
-z6mCU+L8UUgEYSlbe4KuVnkC91kYEkjb33WyiJUtn8b7etEBvHDALuS+L55DnT2O
-WdsDzkPSXuttLPp9lCsUX6ziiAe/knYS9/xv5ZOFPmC3iBTzWv9H2xtl82ormRU=
-=4gfl
+iQEcBAEBCAAGBQJQ34XGAAoJEJ0WA1zPCt1htzsH/iWicwTGR6vB9+lEoL/yDGIF
+EtD3gCr7VgaoDkvjSIGTopjS0dlNLFQnBsFuqfYcqsumVqargscFCH+7m2P/0ouT
+4bTmd4Vp0r2j6aCi6Krb4+CrD2c9tphqTXgcFpsRRJ41joq0itGwY36KRC2KgjiA
+ZQQafepNawPzzOV6LKv3gTXvtmRMmiVd3Hn/Bky9IPrccdCebvYWufdwKRygFngb
+eJ5GedEpy+fhUkU6iMt86aoiy0ifgfhw7eWyIwvHaROspzrsreib9DVmcC6QNfhg
+/+eTE6djrcK/vaYWpVcwcpuxHZcoTcySue8Nrjxdnc8Bol9PyESxT1fEAlBK9Ks=
+=hPV4
 -----END PGP SIGNATURE-----
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
deleted file mode 100644
index 280d7d4b9017..000000000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 68d6bc237c2076d3ff2a75a6a85e198807f8132a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Tue, 6 Nov 2012 21:03:39 +0100
-Subject: [PATCH 1/3] fix bgo #680399 - gtranslator 2.91.5 segfaults trying to
- use any plugin (gnome 3.5.x stack)
-
-- Update data/layout.xml, some attributes have changed
-- Several Dock object constructors take a G_OBJECT instead of a GDL_DOCK
-- GdlDockLayout member master is not accessible anymore
-- Block layout-changed signal when loading a new layout
----
- data/layout.xml | 34 +++++++++++++++-------------------
- src/gtr-tab.c   | 14 ++++++++++----
- 2 files changed, 25 insertions(+), 23 deletions(-)
-
-diff --git a/data/layout.xml b/data/layout.xml
-index 85f7f64..f3e313e 100644
---- a/data/layout.xml
-+++ b/data/layout.xml
-@@ -3,30 +3,26 @@
- <dock-layout>
-   <layout name="__default__">
-     <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
--      <paned orientation="horizontal" locked="no" position="1164">
--        <paned orientation="horizontal" locked="no" position="244">
--          <notebook orientation="vertical" locked="no" page="0">
--            <item name="GtrOpenTranPlugin" orientation="vertical" locked="no"/>
--            <item name="GtrCharmapPanel" orientation="vertical" locked="no"/>
--            <placeholder name="ph_left" next-placement="center"/>
-+      <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
-+        <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
-+          <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+            <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+            <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-           </notebook>
--          <paned orientation="vertical" locked="no" position="416">
--            <notebook orientation="vertical" locked="no" page="0">
--              <item name="GtrMessageTable" orientation="vertical" locked="no"/>
--              <placeholder name="ph_top" next-placement="center"/>
-+          <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
-+            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+              <item name="GtrMessageTable" orientation="vertical" locked="no"  iconified="no" closed="no"/>
-             </notebook>
--            <notebook orientation="vertical" locked="no" page="0">
--              <item name="GtrTranslationFields" orientation="vertical" locked="no"/>
--              <placeholder name="ph_center" next-placement="bottom"/>
-+            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+              <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
-             </notebook>
-           </paned>
-         </paned>
--        <paned orientation="vertical" locked="no" position="387">
--          <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no"/>
--          <notebook orientation="vertical" locked="no" page="0">
--            <item name="GtrContextPanel" orientation="vertical" locked="no"/>
--            <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no"/>
--            <placeholder name="ph_right" next-placement="center"/>
-+        <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
-+          <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+          <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+            <item name="GtrContextPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+            <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-           </notebook>
-         </paned>
-       </paned>
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index 75fbd35..f22d546 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -727,19 +727,19 @@ gtr_tab_init (GtrTab * tab)
-   gtk_widget_show (priv->dock);
-   gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
- 
--  dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
-+  dockbar = gdl_dock_bar_new (G_OBJECT (priv->dock));
-   gtk_widget_show (dockbar);
-   gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
- 
--  priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
--  g_signal_connect (priv->layout_manager->master,
-+  priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
-+  g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
-                     "layout-changed",
-                     G_CALLBACK (on_layout_changed),
-                     tab);
- 
-   g_settings_bind (priv->ui_settings,
-                    GTR_SETTINGS_PANEL_SWITCHER_STYLE,
--                   priv->layout_manager->master,
-+                   gdl_dock_layout_get_master (priv->layout_manager),
-                    "switcher-style",
-                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- 
-@@ -967,11 +967,17 @@ gtr_tab_realize (GtkWidget *widget)
-                                   tab);
- 
-       /* Loading dock layout */
-+      g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+                                       G_CALLBACK (on_layout_changed),
-+                                       tab);
-       filename = g_build_filename (gtr_dirs_get_user_config_dir (),
-                                    "layout.xml", NULL);
- 
-       gtr_tab_layout_load (tab, filename, NULL);
-       g_free (filename);
-+      g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+                                         G_CALLBACK (on_layout_changed),
-+                                         tab);
- 
-       tab->priv->tab_realized = TRUE;
-     }
--- 
-1.8.0
-
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
deleted file mode 100644
index f170da510add..000000000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 22da0a85fec480943411c25c0d361b3fa2252381 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Wed, 14 Nov 2012 22:00:47 +0100
-Subject: [PATCH 2/3] fix bgo #687432 - gtranslator can't load/save tab
- layout, cause gdl 3.6
-
-Do not save the layout after each change.
-Fix the default layout to remove GtrOpenTranPlugin and GtrCharmapPanel pane as
-GDL 3.6.0 does not hide them as it should.
----
- data/layout.xml | 16 +++++-----------
- src/gtr-tab.c   | 18 ------------------
- 2 files changed, 5 insertions(+), 29 deletions(-)
-
-diff --git a/data/layout.xml b/data/layout.xml
-index f3e313e..117f471 100644
---- a/data/layout.xml
-+++ b/data/layout.xml
-@@ -4,19 +4,13 @@
-   <layout name="__default__">
-     <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
-       <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
--        <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
-+        <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
-           <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
--            <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
--            <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+            <item name="GtrMessageTable" orientation="vertical" locked="no"  iconified="no" closed="no"/>
-+          </notebook>
-+          <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+            <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
-           </notebook>
--          <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
--            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
--              <item name="GtrMessageTable" orientation="vertical" locked="no"  iconified="no" closed="no"/>
--            </notebook>
--            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
--              <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
--            </notebook>
--          </paned>
-         </paned>
-         <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
-           <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index f22d546..4c7760a 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -671,13 +671,6 @@ save_layout (GtrTab *tab)
- }
- 
- static void
--on_layout_changed (GdlDockMaster *master,
--                   GtrTab        *tab)
--{
--  save_layout (tab);
--}
--
--static void
- extension_added (PeasExtensionSet *extensions,
-                  PeasPluginInfo   *info,
-                  PeasExtension    *exten,
-@@ -732,11 +725,6 @@ gtr_tab_init (GtrTab * tab)
-   gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
- 
-   priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
--  g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
--                    "layout-changed",
--                    G_CALLBACK (on_layout_changed),
--                    tab);
--
-   g_settings_bind (priv->ui_settings,
-                    GTR_SETTINGS_PANEL_SWITCHER_STYLE,
-                    gdl_dock_layout_get_master (priv->layout_manager),
-@@ -967,17 +955,11 @@ gtr_tab_realize (GtkWidget *widget)
-                                   tab);
- 
-       /* Loading dock layout */
--      g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
--                                       G_CALLBACK (on_layout_changed),
--                                       tab);
-       filename = g_build_filename (gtr_dirs_get_user_config_dir (),
-                                    "layout.xml", NULL);
- 
-       gtr_tab_layout_load (tab, filename, NULL);
-       g_free (filename);
--      g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
--                                         G_CALLBACK (on_layout_changed),
--                                         tab);
- 
-       tab->priv->tab_realized = TRUE;
-     }
--- 
-1.8.0
-
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
deleted file mode 100644
index 15b4d750c50d..000000000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 398ebe3e8b5271261423d60849452423bf0dfb51 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Tue, 20 Nov 2012 21:57:53 +0100
-Subject: [PATCH 3/3] Another fix for bgo#680399 - gtranslator 2.91.5
- segfaults trying to use any plugin (gnome 3.5.x stack)
-
-Keep saving the layout on each change but connect the signal after loading the
-layout and disconnect it after saving it for the last time.
----
- src/gtr-tab.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index 4c7760a..2ebf60b 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -671,6 +671,13 @@ save_layout (GtrTab *tab)
- }
- 
- static void
-+on_layout_changed (GdlDockMaster *master,
-+                   GtrTab        *tab)
-+{
-+  save_layout (tab);
-+}
-+
-+static void
- extension_added (PeasExtensionSet *extensions,
-                  PeasPluginInfo   *info,
-                  PeasExtension    *exten,
-@@ -882,6 +889,9 @@ gtr_tab_dispose (GObject * object)
- 
-   if (!priv->dispose_has_run)
-     {
-+      g_signal_handlers_disconnect_by_func (gdl_dock_layout_get_master (priv->layout_manager),
-+                                            G_CALLBACK (on_layout_changed),
-+                                            object);
-       save_layout (GTR_TAB (object));
-       priv->dispose_has_run = TRUE;
-     }
-@@ -962,6 +972,11 @@ gtr_tab_realize (GtkWidget *widget)
-       g_free (filename);
- 
-       tab->priv->tab_realized = TRUE;
-+
-+      g_signal_connect (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+                        "layout-changed",
-+                        G_CALLBACK (on_layout_changed),
-+                        tab);
-     }
- }
- 
--- 
-1.8.0
-
diff --git a/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild b/app-text/gtranslator/gtranslator-2.91.6.ebuild
index 34e7750d165b..9f86124cffde 100644
--- a/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild
+++ b/app-text/gtranslator/gtranslator-2.91.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild,v 1.1 2012/12/17 08:20:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.6.ebuild,v 1.1 2012/12/30 00:07:33 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils gnome2 python-single-r1
+inherit gnome2 python-single-r1
 
 DESCRIPTION="An enhanced gettext po file editor for GNOME"
 HOMEPAGE="http://gtranslator.sourceforge.net/"
@@ -42,15 +42,12 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		gnome-extra/gucharmap:2.90[introspection] )"
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	>=app-text/scrollkeeper-0.1.4
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
-# eautoreconf requires gnome-base/gnome-common
+# eautoreconf requires gnome-base/gnome-common, app-text/yelp-tools
 
 pkg_setup() {
 	use gnome && python-single-r1_pkg_setup
@@ -62,10 +59,8 @@ src_prepare() {
 		--disable-static
 		$(use_with gnome dictionary)
 		$(use_enable gnome introspection)
-		$(use_with spell gtkspell3)"
-
-	# in 2.91.6
-	epatch "${FILESDIR}/${P}-gdl-3.6-"{1,2,3}.patch
+		$(use_with spell gtkspell3)
+		ITSTOOL=$(type -P true)"
 
 	gnome2_src_prepare