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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 14 insertions, 274 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/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