Revbump to include vte-titles and window-title patches (reported by df, bug 418047)

(Portage version: 2.1.10.63/cvs/Linux x86_64)

4 files changed, 190 insertions, 1 deletions

diff --git a/x11-terms/guake/ChangeLog b/x11-terms/guake/ChangeLog
index 01f94f537f19..712453b0f832 100644
--- a/x11-terms/guake/ChangeLog
+++ b/x11-terms/guake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/guake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.16 2012/05/03 07:11:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.17 2012/06/04 18:56:16 xmw Exp $
+
+*guake-0.4.2-r2 (04 Jun 2012)
+
+  04 Jun 2012; Michael Weber <xmw@gentoo.org>
+  +files/guake-0.4.2-vte-titles.patch, +files/guake-0.4.2-window-title.patch,
+  +guake-0.4.2-r2.ebuild:
+  Revbump to include vte-titles and window-title patches (reported by df, bug
+  418047)
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> guake-0.4.2.ebuild,
   guake-0.4.2-r1.ebuild:
diff --git a/x11-terms/guake/files/guake-0.4.2-vte-titles.patch b/x11-terms/guake/files/guake-0.4.2-vte-titles.patch
new file mode 100644
index 000000000000..2559e21feb7b
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.4.2-vte-titles.patch
@@ -0,0 +1,60 @@
+from http://guake.org/ticket/164
+
+diff --git a/data/guake.schemas b/data/guake.schemas
+index 3d26c6d..403bf1d 100644
+--- a/data/guake.schemas
++++ b/data/guake.schemas
+@@ -208,6 +208,18 @@
+             </locale>
+         </schema>
+ 
++	<schema>
++            <key>/schemas/apps/guake/general/use_vte_titles</key>
++            <applyto>/apps/guake/general/use_vte_titles</applyto>
++            <owner>guake</owner>
++            <type>bool</type>
++            <default>true</default>
++            <locale name="C">
++                <short>Use terminal titles for tab naming</short>
++                <long>Any terminal program can set the terminal's title via special escape sequences. Some shells (e.g. bash) display user's prompt there (though you can adjust that to any arbitrary text in bashrc or similar) and update it automatically as the prompt changes. So you can have easy automatically updating meaningful tab titles with this option turned on.</long>
++            </locale>
++        </schema>
++
+         <schema>
+             <key>/schemas/apps/guake/style/font/style</key>
+             <applyto>/apps/guake/style/font/style</applyto>
+diff --git a/src/guake.py b/src/guake.py
+index 6214fb2..81c8057 100644
+--- a/src/guake.py
++++ b/src/guake.py
+@@ -863,6 +863,7 @@ class Guake(SimpleGladeApp):
+         self.client.notify(KEY('/general/use_scrollbar'))
+         self.client.notify(KEY('/general/history_size'))
+         self.client.notify(KEY('/general/show_resizer'))
++        self.client.notify(KEY('/general/use_vte_titles'))
+         self.client.notify(KEY('/style/font/style'))
+         self.client.notify(KEY('/style/font/color'))
+         self.client.notify(KEY('/style/font/palette'))
+@@ -982,6 +983,13 @@ class Guake(SimpleGladeApp):
+         """
+         self.delete_tab(self.notebook.page_num(widget), kill=False)
+ 
++    def on_terminal_title_changed(self, vte, box):
++        use_them = self.client.get_bool(KEY("/general/use_vte_titles"))
++        if not use_them:
++            return
++        page = self.notebook.page_num(box)
++        self.tabs.get_children()[page].set_label(vte.get_window_title())
++
+     def on_rename_activate(self, *args):
+         """Shows a dialog to rename the current tab.
+         """
+@@ -1122,6 +1130,8 @@ class Guake(SimpleGladeApp):
+         box.terminal.grab_focus()
+         box.terminal.connect('button-press-event', self.show_context_menu)
+         box.terminal.connect('child-exited', self.on_terminal_exited, box)
++        box.terminal.connect('window-title-changed',
++                             self.on_terminal_title_changed, box)
+         box.show()
+ 
+         self.term_list.append(box.terminal)
diff --git a/x11-terms/guake/files/guake-0.4.2-window-title.patch b/x11-terms/guake/files/guake-0.4.2-window-title.patch
new file mode 100644
index 000000000000..1f876272d9af
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.4.2-window-title.patch
@@ -0,0 +1,58 @@
+from http://guake.org/ticket/164
+
+--- a/src/guake.py	2011-09-21 02:15:42.000000000 +0300
++++ b/src/guake.py.orig	2011-09-21 02:17:46.000000000 +0300
+@@ -894,6 +894,8 @@ class Guake(SimpleGladeApp):
+         """Callback to add a new tab. Called by the accel key.
+         """
+         self.add_tab()
++	page = self.notebook.get_current_page()
++	self.window.set_title(self.term_list[page].get_window_title());
+         return True
+ 
+     def accel_prev(self, *args):
+@@ -903,6 +905,8 @@ class Guake(SimpleGladeApp):
+             self.notebook.set_current_page(self.notebook.get_n_pages()-1)
+         else:
+             self.notebook.prev_page()
++	page = self.notebook.get_current_page()
++	self.window.set_title(self.term_list[page].get_window_title());
+         return True
+ 
+     def accel_next(self, *args):
+@@ -912,6 +916,8 @@ class Guake(SimpleGladeApp):
+             self.notebook.set_current_page(0)
+         else:
+             self.notebook.next_page()
++	page = self.notebook.get_current_page()
++	self.window.set_title(self.term_list[page].get_window_title());
+         return True
+ 
+     def accel_rename(self, *args):
+@@ -989,6 +995,7 @@ class Guake(SimpleGladeApp):
+             return
+         page = self.notebook.page_num(box)
+         self.tabs.get_children()[page].set_label(vte.get_window_title())
++	self.window.set_title(vte.get_window_title());
+ 
+     def on_rename_activate(self, *args):
+         """Shows a dialog to rename the current tab.
+@@ -1188,6 +1195,8 @@ class Guake(SimpleGladeApp):
+             self.hide()
+             # avoiding the delay on next Guake show request
+             self.add_tab()
++	else:
++		self.window.set_title(self.term_list[self.notebook.get_current_page()].get_window_title());
+ 
+     def delete_shell(self, pid):
+         """This function will kill the shell on a tab, trying to send
+@@ -1224,7 +1233,9 @@ class Guake(SimpleGladeApp):
+         """Grabs the focus on the current tab.
+         """
+         page = self.notebook.get_current_page()
++	self.window.set_title(self.term_list[page].get_window_title());
+         self.term_list[page].grab_focus()
++	# self.window.set_title();
+ 
+     def select_current_tab(self, notebook, user_data, page):
+         """When current self.notebook page is changed, the tab bar
diff --git a/x11-terms/guake/guake-0.4.2-r2.ebuild b/x11-terms/guake/guake-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..32c375ca6bf4
--- /dev/null
+++ b/x11-terms/guake/guake-0.4.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2-r2.ebuild,v 1.1 2012/06/04 18:56:16 xmw Exp $
+
+EAPI=4
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.7"
+
+inherit eutils gnome2 python multilib
+
+DESCRIPTION="A dropdown terminal made for the GNOME desktop"
+HOMEPAGE="http://guake.org/"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
+#SRC_URI="http://guake.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	dev-python/pygtk
+	x11-libs/vte:0[python]
+	dev-python/notify-python
+	dev-python/gconf-python
+	dev-python/dbus-python
+	>=gnome-base/gconf-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="--disable-static
+		--disable-dependency-tracking
+		$(use_enable nls)"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-int-ssl-port.patch \
+		"${FILESDIR}"/${P}-prefs-spinbox.patch \
+		"${FILESDIR}"/${P}-glib2.32.patch \
+		"${FILESDIR}"/${P}-vte-titles.patch \
+		"${FILESDIR}"/${P}-window-title.patch
+
+	sed -i -e s:/usr/bin/python:/usr/bin/python2: src/guake*.in || die
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}