bump

svn path=/maintainer/; revision=96

3 files changed, 36 insertions, 10 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index c79c474..29927de 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -2,6 +2,8 @@ AUX gnome-terminal-2-dnd_url_add_space.patch 1000 RMD160 e83cf094681389b3a82b5f9
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.22.1-orange-cursor.patch 892 RMD160 23d3dae3715bd06e4219554f9611387a023cde6d SHA1 e9e3985c6b494aa9a048aff89f2e3b0711b04f8d SHA256 571af26e6223ce03977881bb7ddb6d80025b5d7617ac51bb08ea11ba002ef4c4
 AUX gnome-terminal-2.22.3-tab-close-fix.patch 1025 RMD160 a3020d4e74d0bc536786399e34dae1ff64b7bcd6 SHA1 397ae4e550536599d5013a340a92481c05f45011 SHA256 1677d7aee5186b296a1d8103c109e12bb93a7d80c29c3dcd007772e96a619db2
+AUX gnome-terminal-2.23.6-orange-cursor.patch 948 RMD160 572b42df698746caf44fe6eacc14b4ff95df7bda SHA1 069798ae5e9bb1c9313d74cd69fbebf42bffb277 SHA256 2f0ddb5c994fa4fc01de1c12cc5ea411cf15474b9116534a56a126f7f6623c80
 DIST gnome-terminal-2.22.3.tar.bz2 1803177 RMD160 f90e99dbff067425b7bb7f373565485f7e60f04c SHA1 8aaf556134884d3f7430e7966ff2c87df5843e3e SHA256 fffe2b352167fa42680cae79be80c5082cd4a04f712564bc4ae5ff0253509cd7
+DIST gnome-terminal-2.23.6.tar.bz2 1830432 RMD160 7eec476b3e61fab2ec819aeb966ff0ab5d0097cf SHA1 478fac834e022e3cf6a34fc7107d40658878fd15 SHA256 5dbeff80fadd85bd4a4ef04172d0fd3ebb407d20f713c7888324525804953bb9
 EBUILD gnome-terminal-2.22.3-r1.ebuild 1801 RMD160 f2fb44fe6c8f2da3e8f2eb75387a1e1ee94b698e SHA1 cfcb8427cd6a6bb9b6a1c78fc0bc769e25311e14 SHA256 da1aad70a58b8194391d2a7fa993e7614089f3e9157ae762f6efa35cfa21b170
-EBUILD gnome-terminal-2.22.3.ebuild 1716 RMD160 c2d8e5883c50fdcb25011076ca73e05523d92335 SHA1 5da31821272a7926241ccc62676b0f127e041c02 SHA256 808c51b6800668623252a12fe19d6b6edd0b983525f529a2f35d81dfae265bf8
+EBUILD gnome-terminal-2.23.6.ebuild 1705 RMD160 1980e5b9ca409aa44b3cf0b4eef29691ead2f605 SHA1 1afb007189313a64b4866fd4a11cbf7c1e7e5e5b SHA256 70fc5ea7e3c15ffbbda17556118e91a1430aa972fd8ca3a44365846fa78a5a56
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.23.6-orange-cursor.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.23.6-orange-cursor.patch
new file mode 100644
index 0000000..9c3a3ef
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.23.6-orange-cursor.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-terminal-2.23.6.orig/src/terminal-screen.c gnome-terminal-2.23.6/src/terminal-screen.c
+--- gnome-terminal-2.23.6.orig/src/terminal-screen.c	2008-08-04 12:51:34.000000000 -0400
++++ gnome-terminal-2.23.6/src/terminal-screen.c	2008-08-14 12:03:06.000000000 -0400
+@@ -1037,6 +1037,7 @@ update_color_scheme (TerminalScreen *scr
+   const GdkColor *fg_color, *bg_color;
+   GdkColor fg, bg;
+   guint n_colors;
++  GdkColor cursor;
+ 
+   style = gtk_widget_get_style (GTK_WIDGET (screen));
+   if (!style)
+@@ -1061,6 +1062,12 @@ update_color_scheme (TerminalScreen *scr
+   vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
+                            colors, n_colors);
+   vte_terminal_set_background_tint_color (VTE_TERMINAL (screen), &bg);
++
++  cursor.red = 65280;
++  cursor.green = 30208;
++  cursor.blue = 0;
++
++  vte_terminal_set_color_cursor(VTE_TERMINAL(screen), &cursor);
+ }
+ 
+ void
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.23.6.ebuild
index 10f0056..af04bb6 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.22.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.23.6.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.2.ebuild,v 1.1 2008/05/31 10:56:45 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
 
@@ -13,22 +13,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/xft
-	>=dev-libs/glib-2.15.2
+	>=dev-libs/glib-2.16.0
 	>=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
+	  sys-devel/gettext
+	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
+	  gnome-base/gnome-common
 	>=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
@@ -38,12 +38,12 @@ src_unpack() {
 
 	# 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
+	#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"
+		src/Makefile.am src/Makefile.in
 
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
@@ -51,7 +51,7 @@ src_unpack() {
 	#epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch
 
 	# Orange cursor
-	epatch "${FILESDIR}"/${PN}-2.22.1-orange-cursor.patch
+	epatch "${FILESDIR}"/${PN}-2.23.6-orange-cursor.patch
 
 	eautomake
 }