New version for GNOME 2.26. Dropped libbonobo, libgnome and libgnomeui dependencies, lots of bug fixes. Clean up old revisions.

(Portage version: 2.2_rc31/cvs/Linux x86_64)

7 files changed, 58 insertions, 175 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 358b76d1281c..ed2eb6e4f4cd 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.195 2009/04/28 11:05:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.196 2009/05/04 23:07:23 eva Exp $
+
+*gnome-terminal-2.26.1 (04 May 2009)
+
+  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-terminal-2.22.3-tab-close-fix.patch,
+  -files/gnome-terminal-2-default_shell.patch,
+  -files/gnome-terminal-2-dnd_url_add_space.patch,
+  -gnome-terminal-2.18.2.ebuild, -gnome-terminal-2.22.3-r1.ebuild,
+  +gnome-terminal-2.26.1.ebuild:
+  New version for GNOME 2.26. Dropped libbonobo, libgnome and libgnomeui
+  dependencies, lots of bug fixes. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-terminal-2.24.2-r1.ebuild:
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2-default_shell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2-default_shell.patch
deleted file mode 100644
index 41ec3f2ca115..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2-default_shell.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gnome-terminal.schemas.orig	2003-02-21 20:06:56.000000000 -0600
-+++ src/gnome-terminal.schemas	2003-02-21 20:07:13.000000000 -0600
-@@ -341,7 +341,7 @@
-       <applyto>/apps/gnome-terminal/profiles/Default/login_shell</applyto>
-       <owner>gnome-terminal</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-          <short>Whether to launch the command in the terminal as a login shell</short>
-          <long>
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2-dnd_url_add_space.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2-dnd_url_add_space.patch
deleted file mode 100644
index 57f3b327136d..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2-dnd_url_add_space.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur gnome-terminal-2.0.2/src/terminal-screen.c gnome-terminal-2.0.2-spaced/src/terminal-screen.c
---- gnome-terminal-2.0.2/src/terminal-screen.c	2002-10-19 06:24:26.000000000 +1300
-+++ gnome-terminal-2.0.2-spaced/src/terminal-screen.c	2003-01-13 10:42:10.000000000 +1300
-@@ -1820,6 +1820,9 @@
-                                                str->str,
-                                                str->len);
- 
-+        terminal_widget_write_data_to_child (screen->priv->term,
-+                                             " ", 1);
-+
-         g_free (filename);        
-         g_string_free (str, TRUE);
-       }
-@@ -1872,6 +1875,8 @@
-             flat = g_strjoinv (" ", uris);
-             terminal_widget_write_data_to_child (screen->priv->term,
-                                                  flat, strlen (flat));
-+            terminal_widget_write_data_to_child (screen->priv->term,
-+                                                 " ", 1);
-             g_free (flat);
-           }
- 
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
deleted file mode 100644
index 34f26d9a1751..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.3-tab-close-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild
deleted file mode 100644
index 5293927f8572..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.18.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 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.18.2.ebuild,v 1.11 2009/01/06 01:57:42 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE=""
-
-RDEPEND="x11-libs/libXft
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.14
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.15.3
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	!gnome-base/gnome-core
-	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"
-# gnome-core overwrite /usr/bin/gnome-terminal
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2-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
-	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
-
-	# Remove the intltoolize call when tarballs are made with >=intltool-0.35.5
-	intltoolize --force || die
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild
deleted file mode 100644
index 48c66f81ec0d..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.22.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 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.3-r1.ebuild,v 1.8 2009/01/05 13:42:59 remi 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="x11-libs/libXft
-	>=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"
-
-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"
-
-	# 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
-	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
-
-	eautomake
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.1.ebuild
new file mode 100644
index 000000000000..05c6c83b6566
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.26.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 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.26.1.ebuild,v 1.1 2009/05/04 23:07:23 eva 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=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/gconf-2.14
+	>=x11-libs/startup-notification-0.8
+	>=x11-libs/vte-0.20.0
+	>=dev-libs/dbus-glib-0.6
+	x11-libs/libSM"
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=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"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-smclient-backend"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Use login shell by default (#12900)
+	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.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
+	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
+}