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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 57 insertions, 119 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/Manifest b/x11-terms/gnome-terminal/Manifest
index 74927ea320bf..e0f68627b52b 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,19 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-terminal-2-default_shell.patch 490 RMD160 22b0e40dc8a6cae17d391e2e21dc0dda60201d23 SHA1 cb9a4b23285cc70eb36a17919463bd3796d7974f SHA256 89248a85b8c921274d336467ba355032d6621fb09efd1a6ab86c64ee90d69c5b
 AUX gnome-terminal-2-dnd_url_add_space.patch 1000 RMD160 e83cf094681389b3a82b5f9c5cd40431ccaef810 SHA1 468cd7aae84d809b714b8bc15e2e903deb437621 SHA256 d807989dc7aec88f1d01e9449a5d44232e5d01fb64bea91fb2a181bf3080116c
 AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.22.0-fix-detach-tab.patch 1152 RMD160 6e161f0c962d381bd9135b400c399ddcbf6949d6 SHA1 d94bf5c2779e1076ca5faa5067e40f62a86a8222 SHA256 7bb381b0f70c9d88bbf376af930eb3dc508836a7c4aab5276c492f53a2cf6a11
+AUX gnome-terminal-2.22.3-tab-close-fix.patch 1025 RMD160 a3020d4e74d0bc536786399e34dae1ff64b7bcd6 SHA1 397ae4e550536599d5013a340a92481c05f45011 SHA256 1677d7aee5186b296a1d8103c109e12bb93a7d80c29c3dcd007772e96a619db2
 DIST gnome-terminal-2.18.2.tar.bz2 2057415 RMD160 b38a45f8f6c9fbffaedd8d4d9dfc9c1a21738746 SHA1 a37dff35e90ab1c2e15d47d5731ff0fb596dbd4d SHA256 f046e938f14aa2ec5cc6db5a85d7ffaf470b3cc233257ca55d2fa7530daa28d1
 DIST gnome-terminal-2.18.4.tar.bz2 2072290 RMD160 0d4125cf7d4cf6f04b648f4fe10c623af84018b0 SHA1 3ad03fd96f9ba51bc654e824d7177921d42f2f85 SHA256 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282
-DIST gnome-terminal-2.22.0.tar.bz2 1819541 RMD160 1d823f9256d8b4f97cc1e87d5c56eb16a5d29499 SHA1 d39f16c864f05a9d1b789b922c7fc8b199be5d0a SHA256 f157938dbfe0babe8545bcdb7b1fa51403bbf17904d56f3242a528d55190b56e
-DIST gnome-terminal-2.22.1.tar.bz2 1801064 RMD160 b101493bdf74c6ddfd7f08f0875f097c998b194e SHA1 87fca1f6bbb7dcbc5f9d6ad4397bacf0cca7e42a SHA256 02a520102920618a099d3d34955dc639b255f5d130df9505fe2f7653e40c6767
-DIST gnome-terminal-2.22.2.tar.bz2 1804470 RMD160 7b0bc534bcedb1ce0a363d516fd4fde9b0b6cebe SHA1 c8948f815c5d3ac76354aa8ae25840c2fbe19912 SHA256 5520495774beaf6999133b975d08c909f1fce639a74f3a674a88da40f837a0ae
 DIST gnome-terminal-2.22.3.tar.bz2 1803177 RMD160 f90e99dbff067425b7bb7f373565485f7e60f04c SHA1 8aaf556134884d3f7430e7966ff2c87df5843e3e SHA256 fffe2b352167fa42680cae79be80c5082cd4a04f712564bc4ae5ff0253509cd7
 EBUILD gnome-terminal-2.18.2.ebuild 1694 RMD160 7bc1b5c1cf3af2bd097615e4f94981f07b1f5a7b SHA1 502dd2359f6d77626056082fd56bc43aa0e4443e SHA256 2995775e4694b0592bbfa9df61869ac17648c57474fa58faa427b0b719fdd672
 EBUILD gnome-terminal-2.18.4.ebuild 1590 RMD160 05da1c0d37e9202211bf0dfd996fd655555f7b45 SHA1 694de7dfae22ea4bcaaf3cb10757918e4ca6d04a SHA256 1b3db3f9fce6100ce47124e483b07fa2d9c4aea8e57509c138e2fe29e8988f8f
-EBUILD gnome-terminal-2.22.0.ebuild 1753 RMD160 8946ac921acafa972a42a5c29b8da1fbc2d4baf5 SHA1 de58341a94cc0a2568ea8d5b89814fec0f788dc9 SHA256 ce1d2acee69d5aa476d44ec6263adb7a1c0921b857b029c502ab191689486c79
-EBUILD gnome-terminal-2.22.1.ebuild 1643 RMD160 6b5aab597c0b5f027fee2f71fb9dfd98cec29af4 SHA1 f0d3ac3656ba61cf90d289c043dd7a16544e1796 SHA256 98974baa711251af36376d5c5cf9827b7f97b0266229d76662351b97db555cfd
-EBUILD gnome-terminal-2.22.2.ebuild 1643 RMD160 72fcc997233a060e9f095def9b4d483811fc2cec SHA1 b62a8d896546388808b78be5982d0b16013d42ba SHA256 90dac3bd28df20e5de5f0c727694079914013a4ca03b1945aaa5902ca804c9cc
+EBUILD gnome-terminal-2.22.3-r1.ebuild 1728 RMD160 65f2776c1fd8f3021171a1d8106ddbfb9ff13b77 SHA1 f3c9cb2219019ba7b5bf5179033a32a5f724c236 SHA256 05162d84d712d7eae8606f4e623b544c2279a103fe75b0f15706fc40f8aadba7
 EBUILD gnome-terminal-2.22.3.ebuild 1644 RMD160 791c9ef29bcbe0f062a30d1a87c9f004b5856933 SHA1 e4ac6223b8b34fabf8e473e28676be1c4cfb2cd0 SHA256 ebfb5804dcaa5fd45d07573e3dfd1a71ce86d71e320e2a6921cff85f7965fcb9
-MISC ChangeLog 22081 RMD160 eca877daf8727485242820a205abede56ccce8ba SHA1 4a7f692dc4b7f9b5598c362b583f2cb117a81def SHA256 4188ae7bd96e1ec329b77ebe4ad23d14b8012bd1297d150c4f451e0aac2edb78
+MISC ChangeLog 22440 RMD160 58b69f970fdad9cda7550daf3f566f7071515080 SHA1 306ac3b9a79995fed3d897971656f547e9f107b6 SHA256 1157e175df3e7b767c13e5a50dfd50f4459054230eddb9499ed3db357e352eba
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiV8ZkACgkQ1fmVwcYIWAbDHgCffJJMXuH3RfQ97HKv0WaJJMHP
+LQQAoI7SRLYiiRvlEqFqYx3tyLs8mrio
+=IpkN
+-----END PGP SIGNATURE-----
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