New release: 0.11.18. Pruning old ebuilds/patches.

(Portage version: 2.1_pre4-r1)

6 files changed, 60 insertions, 27 deletions

diff --git a/x11-libs/vte/files/digest-vte-0.11.15 b/x11-libs/vte/files/digest-vte-0.11.15
deleted file mode 100644
index 17efa6ba80fb..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 959449
diff --git a/x11-libs/vte/files/digest-vte-0.11.15-r1 b/x11-libs/vte/files/digest-vte-0.11.15-r1
deleted file mode 100644
index 17efa6ba80fb..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9dc7b330d52ce384e3e5715d396c72f vte-0.11.15.tar.bz2 959449
diff --git a/x11-libs/vte/files/digest-vte-0.11.16 b/x11-libs/vte/files/digest-vte-0.11.16
deleted file mode 100644
index c842012fff46..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce5c5bf91da638547ce093fe66622c37 vte-0.11.16.tar.bz2 961577
diff --git a/x11-libs/vte/files/digest-vte-0.11.18 b/x11-libs/vte/files/digest-vte-0.11.18
new file mode 100644
index 000000000000..f28ccaa1a9d0
--- /dev/null
+++ b/x11-libs/vte/files/digest-vte-0.11.18
@@ -0,0 +1,3 @@
+MD5 e808006c365fddca611960b2efaef6a5 vte-0.11.18.tar.bz2 951701
+RMD160 1bcd6a348b11a6dda015aec24fa4a43f8ce4af55 vte-0.11.18.tar.bz2 951701
+SHA256 ec9f2436c8110f1e157d9223b164695e46868e2171beebfba8f02df28444820d vte-0.11.18.tar.bz2 951701
diff --git a/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch b/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch
deleted file mode 100644
index eb8bb8899300..000000000000
--- a/x11-libs/vte/files/vte-0.11.15-gdk-warnings.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- vte-0.11.13/src/vtebg.c	20 Apr 2004 06:35:43 -0000	1.9
-+++ vte-0.11.13/src/vtebg.c	25 Jun 2005 21:38:09 -0000
-@@ -112,7 +112,7 @@
- 			  XID **pixmaps)
- {
- 	return gdk_property_get(window, atom, GDK_TARGET_PIXMAP,
--				0, INT_MAX,
-+				0, INT_MAX - 3,
- 				FALSE,
- 				type, NULL, size,
- 				(guchar**) pixmaps);
-
---- vte-0.11.13/src/vterdb.c	20 Apr 2004 05:16:56 -0000	1.8
-+++ vte-0.11.13/src/vterdb.c	25 Jun 2005 21:38:09 -0000
-@@ -40,7 +40,7 @@
- 			 char **retval)
- {
- 	return gdk_property_get(window, atom, GDK_TARGET_STRING,
--				0, INT_MAX,
-+				0, INT_MAX - 3,
- 				FALSE,
- 				type, NULL, size,
- 				(guchar**) retval);
-
diff --git a/x11-libs/vte/files/vte-0.11.18-line-scroll.patch b/x11-libs/vte/files/vte-0.11.18-line-scroll.patch
new file mode 100644
index 000000000000..de2e7dfe56c9
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.11.18-line-scroll.patch
@@ -0,0 +1,57 @@
+--- vte.c.ORG	2004-03-06 10:28:09.000000000 -0800
++++ vte.c	2004-03-06 10:44:23.000000000 -0800
+@@ -1917,4 +1917,31 @@
+ }
+ 
++/* Scroll up or down in the current screen. */
++static void
++vte_terminal_scroll_lines(VteTerminal *terminal, gint lines)
++{
++        glong destination;
++        g_return_if_fail(VTE_IS_TERMINAL(terminal));
++#ifdef VTE_DEBUG
++        if (_vte_debug_on(VTE_DEBUG_IO)) {
++                fprintf(stderr, "Scrolling %d lines.\n", lines);
++        }
++#endif
++        /* Calculate the ideal position where we want to be before clamping. */
++        destination = floor(gtk_adjustment_get_value(terminal->adjustment));
++        destination += lines;
++        /* Can't scroll past data we have. */
++        destination = CLAMP(destination,
++                            terminal->adjustment->lower,
++                            terminal->adjustment->upper - terminal->row_count);
++        /* Tell the scrollbar to adjust itself. */
++        gtk_adjustment_set_value(terminal->adjustment, destination);
++        /* Clear dingus match set. */
++        _vte_terminal_match_contents_clear(terminal);
++        /* Notify viewers that the contents have changed. */
++        _vte_terminal_emit_contents_changed(terminal);
++}
++
++
+ /* Scroll so that the scroll delta is the minimum value. */
+ static void
+@@ -8038,4 +8065,22 @@
+ 			}
+ 			break;
++		case GDK_KP_Up:
++                case GDK_Up:
++                        if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
++                                vte_terminal_scroll_lines(terminal, -1);
++                                scrolled = TRUE;
++                                handled = TRUE;
++                                suppress_meta_esc = TRUE;
++                        }
++                        break;
++                case GDK_KP_Down:
++                case GDK_Down:
++                        if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
++                                vte_terminal_scroll_lines(terminal, 1);
++                                scrolled = TRUE;
++                                handled = TRUE;
++                                suppress_meta_esc = TRUE;
++                        }
++                        break;
+ 		case GDK_KP_Home:
+ 		case GDK_Home: