bump to r1. Fix extra refs to tabs shell, bug #219964. Clean up old revisions.

(Portage version: 2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

5 files changed, 44 insertions, 112 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 705bda50d6b2..f2844203fb3f 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.170 2008/07/30 21:46:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.171 2008/08/03 17:57:39 eva Exp $
+
+*gnome-terminal-2.22.3-r1 (03 Aug 2008)
+
+  03 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-terminal-2.22.3-tab-close-fix.patch,
+  -gnome-terminal-2.22.0.ebuild, -gnome-terminal-2.22.1.ebuild,
+  -gnome-terminal-2.22.2.ebuild, +gnome-terminal-2.22.3-r1.ebuild:
+  bump to r1. Fix extra refs to tabs shell, bug #219964. Clean up old
+  revisions.
 
   30 Jul 2008; Brent Baude <ranger@gentoo.org> gnome-terminal-2.22.3.ebuild:
   Marking gnome-terminal-2.22.3 ppc stable for bug 229709
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch
new file mode 100644
index 000000000000..34f26d9a1751
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch
@@ -0,0 +1,29 @@
+diff -urNp gnome-terminal-2.22.3-orig/src/terminal-window.c gnome-terminal-2.22.3/src/terminal-window.c
+--- gnome-terminal-2.22.3-orig/src/terminal-window.c	2008-08-01 16:23:04.000000000 +0530
++++ gnome-terminal-2.22.3/src/terminal-window.c	2008-08-01 23:29:19.000000000 +0530
+@@ -1367,14 +1367,9 @@ selection_changed_callback (TerminalScre
+ }
+ 
+ static void
+-close_button_clicked_cb (GtkWidget *widget, GtkWidget *screen)
++close_button_clicked_cb (GtkWidget *widget, TerminalScreen *screen)
+ {
+-  GtkWidget *notebook;
+-  guint page_num;
+-
+-  notebook = gtk_widget_get_parent (GTK_WIDGET (screen));
+-  page_num = gtk_notebook_page_num (GTK_NOTEBOOK (notebook), screen);
+-  gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), page_num);
++  terminal_screen_close (screen);
+ }
+ 
+ static void
+@@ -1458,8 +1453,6 @@ terminal_window_add_screen (TerminalWind
+   if (old == window)
+     return;  
+ 
+-  g_object_ref (G_OBJECT (screen)); /* make our own new refcount */
+-
+   if (old)
+     terminal_window_remove_screen (old, screen);
+ 
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild
deleted file mode 100644
index 6b7278ef8da3..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild,v 1.1 2008/03/22 01:08:28 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/xft
-	>=dev-libs/glib-2.15.2
-	>=x11-libs/gtk+-2.12
-	>=gnome-base/gconf-2.14
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.15.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${P}-default_shell.patch
-
-	# terminal enhancement, inserts a space after a DND URL
-	# patch by Zach Bagnall <yem@y3m.net> in #13801
-	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch
-
-	# Fix detach tab menu item. Upstream bug #521193, patch taken from SVN gnome-2-22 branch
-	epatch "${FILESDIR}/${P}-fix-detach-tab.patch"
-
-	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340
-	# Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=523737
-	sed -i -e '/DISABLE_DEPRECATED/d' \
-		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# Leave out for now; causing too many problems
-	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.2.ebuild
deleted file mode 100644
index 8bbfa58067e8..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.22.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.22.2.ebuild,v 1.1 2008/05/31 10:56:45 eva Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/xft
-	>=dev-libs/glib-2.15.2
-	>=x11-libs/gtk+-2.12
-	>=gnome-base/gconf-2.14
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.15.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
-
-	# terminal enhancement, inserts a space after a DND URL
-	# patch by Zach Bagnall <yem@y3m.net> in #13801
-	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch
-
-	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340
-	# Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=523737
-	sed -i -e '/DISABLE_DEPRECATED/d' \
-		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
-
-	# patch gnome terminal to report as GNOME rather than xterm
-	# This needs to resolve a few bugs (#120294,)
-	# Leave out for now; causing too many problems
-	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-
-	eautomake
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild
index ad2dfbfd7be5..1c9c25c3c5d8 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.22.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.22.1.ebuild,v 1.1 2008/04/07 21:24:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild,v 1.1 2008/08/03 17:57:39 eva Exp $
 
 inherit eutils gnome2 autotools
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2
 	>=app-text/scrollkeeper-0.3.11"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 src_unpack() {
 	gnome2_src_unpack
@@ -45,6 +45,9 @@ src_unpack() {
 	sed -i -e '/DISABLE_DEPRECATED/d' \
 		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
 
+	# Fix extra refs on tabs, bug #219964
+	epatch "${FILESDIR}/${P}-tab-close-fix.patch"
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems