bump to 2.18.4 and cleanup old revisions

Package-Manager: portage-2.1.4_rc14

8 files changed, 37 insertions, 158 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 2c53f6052c40..f0d8bd60a610 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.157 2007/12/06 09:45:26 leio Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.158 2008/01/09 21:54:40 eva Exp $
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-terminal-2.15-tab-switching-no-resize.patch,
+  -gnome-terminal-2.16.1.ebuild, -gnome-terminal-2.18.1.ebuild:
+  cleanup old revisions
+
+*gnome-terminal-2.18.4 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-terminal-2.18.4.ebuild:
+  bump to 2.18.4
 
   06 Dec 2007; Mart Raudsepp <leio@gentoo.org> gnome-terminal-2.18.3.ebuild:
   Remove intltoolize call, so that we wouldn't get mismatching Makefiles, bug
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index a19dca4eaf62..d449edb89227 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -13,22 +13,9 @@ AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a0972
 MD5 f080c35539eaf74022350929111b9596 files/gnome-terminal-2.13.90-TERM-gnome.patch 413
 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 files/gnome-terminal-2.13.90-TERM-gnome.patch 413
 SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62 files/gnome-terminal-2.13.90-TERM-gnome.patch 413
-AUX gnome-terminal-2.15-tab-switching-no-resize.patch 1816 RMD160 f1644374f604d1695e0100b202c33ddd4d827337 SHA1 bb203f57dfb0ca17d3288a5ee78131a06957ce3f SHA256 5841d6f19a244ec3cfa0db2705add10e9324b1e5d1b18a8fc87d4b00e29a2422
-MD5 33ed5cb201e9efefb38cd26ce8fe2192 files/gnome-terminal-2.15-tab-switching-no-resize.patch 1816
-RMD160 f1644374f604d1695e0100b202c33ddd4d827337 files/gnome-terminal-2.15-tab-switching-no-resize.patch 1816
-SHA256 5841d6f19a244ec3cfa0db2705add10e9324b1e5d1b18a8fc87d4b00e29a2422 files/gnome-terminal-2.15-tab-switching-no-resize.patch 1816
-DIST gnome-terminal-2.16.1.tar.bz2 1840537 RMD160 a14799916a97d83e866b0245b4883438a57d94f6 SHA1 a969fe3203a622a68fbde1f377d0e48234a27a72 SHA256 814ab099689aabdc6351565215ce6e5a2fc93e8b05fafd3ca70f4cefe167caf0
-DIST gnome-terminal-2.18.1.tar.bz2 1995096 RMD160 fb99a2e42752ae67eda7e2b980c1127e104c849d SHA1 130af5f027f967116f86947ec54be66f0f974df6 SHA256 a66701d5c247c092d9b52ee2209cdb8094f5ce2ab339ee78738ccdb3a0b81cdb
 DIST gnome-terminal-2.18.2.tar.bz2 2057415 RMD160 b38a45f8f6c9fbffaedd8d4d9dfc9c1a21738746 SHA1 a37dff35e90ab1c2e15d47d5731ff0fb596dbd4d SHA256 f046e938f14aa2ec5cc6db5a85d7ffaf470b3cc233257ca55d2fa7530daa28d1
 DIST gnome-terminal-2.18.3.tar.bz2 2070783 RMD160 d92870af7e392954a4cda6995eb076320ae90234 SHA1 ca8e55a1a033c731462ac27a1b92e52cac2dc238 SHA256 621f8ad2b1f510d6da59c9208e953ce372bf7cffe899f27369cdad0aba36b889
-EBUILD gnome-terminal-2.16.1.ebuild 1677 RMD160 cce9e0f08ce73e5c2535a49390c148f89508e799 SHA1 8b86b1ec2a2c7674eafc33cf6634cbb7ddf33a83 SHA256 c80e84a6442543945993ccac64251984a6fc1482e78d46dc842e19a0d100d1b0
-MD5 d164e7808422b24964cdecfa7fb85bc1 gnome-terminal-2.16.1.ebuild 1677
-RMD160 cce9e0f08ce73e5c2535a49390c148f89508e799 gnome-terminal-2.16.1.ebuild 1677
-SHA256 c80e84a6442543945993ccac64251984a6fc1482e78d46dc842e19a0d100d1b0 gnome-terminal-2.16.1.ebuild 1677
-EBUILD gnome-terminal-2.18.1.ebuild 1516 RMD160 e7366aa5328dea25b57d8ffa7eea5966ae147818 SHA1 eab6b9021e5a557a3dede315e3d34c557f2f1101 SHA256 4a10f9e044405183fdd2afdd0f8ce69e51f14b84c0fb7e617fa84c7dad9ee4e2
-MD5 34d0eb179590d746a2c0eceb506ba8e8 gnome-terminal-2.18.1.ebuild 1516
-RMD160 e7366aa5328dea25b57d8ffa7eea5966ae147818 gnome-terminal-2.18.1.ebuild 1516
-SHA256 4a10f9e044405183fdd2afdd0f8ce69e51f14b84c0fb7e617fa84c7dad9ee4e2 gnome-terminal-2.18.1.ebuild 1516
+DIST gnome-terminal-2.18.4.tar.bz2 2072290 RMD160 0d4125cf7d4cf6f04b648f4fe10c623af84018b0 SHA1 3ad03fd96f9ba51bc654e824d7177921d42f2f85 SHA256 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282
 EBUILD gnome-terminal-2.18.2.ebuild 1521 RMD160 86042735495af4d6d086cb34db28a856e1ab5c38 SHA1 e6b295959c9b491ce07e7f82d83ca93da58227f6 SHA256 1032b8173ec23f333001253a4ab356ec652177013844cfeaf4e8f6cfd483bc0f
 MD5 4284a44e6de6e69e5175ea3ea1174952 gnome-terminal-2.18.2.ebuild 1521
 RMD160 86042735495af4d6d086cb34db28a856e1ab5c38 gnome-terminal-2.18.2.ebuild 1521
@@ -37,30 +24,31 @@ EBUILD gnome-terminal-2.18.3.ebuild 1423 RMD160 277baf6a18e6ab97c89831c410c5b580
 MD5 bf694ca40ab75e3050933ec3a4ac8619 gnome-terminal-2.18.3.ebuild 1423
 RMD160 277baf6a18e6ab97c89831c410c5b580c2b09d31 gnome-terminal-2.18.3.ebuild 1423
 SHA256 b99d731fe0c5e25a076472aa53f9239ce3f058f41a97d918f9e4b0f3247fcf53 gnome-terminal-2.18.3.ebuild 1423
-MISC ChangeLog 19638 RMD160 160b6767e181d99de1fbcea49fa8e7639a728456 SHA1 45ba42d4c18aafc0d36ec07c9d7b9f6d65a8c27e SHA256 eeb0e007bde66b403172169de7c370e1d972aa52e4ca1ce216b1af10aaab4275
-MD5 33e511a2fa09c5c73bf47aedf197ee02 ChangeLog 19638
-RMD160 160b6767e181d99de1fbcea49fa8e7639a728456 ChangeLog 19638
-SHA256 eeb0e007bde66b403172169de7c370e1d972aa52e4ca1ce216b1af10aaab4275 ChangeLog 19638
+EBUILD gnome-terminal-2.18.4.ebuild 1422 RMD160 8dab5ff165a043d4378effc30219dc9098d01f96 SHA1 27ba7aff17d5fb8ef1da4e0e7916befeae9f7eb0 SHA256 ef4784c06452440e4380a2b89260098231166616357a67b7b6ce2c0336a23786
+MD5 b43a53d02b6e0a73eb0ad93189f467de gnome-terminal-2.18.4.ebuild 1422
+RMD160 8dab5ff165a043d4378effc30219dc9098d01f96 gnome-terminal-2.18.4.ebuild 1422
+SHA256 ef4784c06452440e4380a2b89260098231166616357a67b7b6ce2c0336a23786 gnome-terminal-2.18.4.ebuild 1422
+MISC ChangeLog 19983 RMD160 6fac2873bdefaaf50528d1abb987891f0769040e SHA1 3b92b8f39cb2bc9fb78ad04147f952af7b2fafb5 SHA256 1bcb11f66683abada34176e7b64b0665c7ac2d64338e855586ab8680a5f90c0a
+MD5 b79a0b4371498bba9a084a435b052f1c ChangeLog 19983
+RMD160 6fac2873bdefaaf50528d1abb987891f0769040e ChangeLog 19983
+SHA256 1bcb11f66683abada34176e7b64b0665c7ac2d64338e855586ab8680a5f90c0a ChangeLog 19983
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 bb4745f30d8ffb9f35cd608b627afc9d files/digest-gnome-terminal-2.16.1 271
-RMD160 a5ebd161ab4f6bea898fe811b1592ced90dc1cf0 files/digest-gnome-terminal-2.16.1 271
-SHA256 0baed1082dc284ebe2d10c9561283e156d51be7b0e50e34b0410f32ab19df55b files/digest-gnome-terminal-2.16.1 271
-MD5 7e065ec7bbedb792945ffe13641c8a83 files/digest-gnome-terminal-2.18.1 271
-RMD160 a6a0303561dbf8bd6a6a751e5794615002f18df0 files/digest-gnome-terminal-2.18.1 271
-SHA256 7d9ae1cbbf5eb5803307321adc5a3528468b87dd5321e3075a3e8368b12e8673 files/digest-gnome-terminal-2.18.1 271
 MD5 1e7970abb0ece7a2ee4c3bc944f4068f files/digest-gnome-terminal-2.18.2 271
 RMD160 fbf8a5795d1799e4979239cfd592961faf91e76b files/digest-gnome-terminal-2.18.2 271
 SHA256 23a515c84b94bd26239e5ae64d16e498022dcbf4f524e7f0daeeffb1f32cb6f2 files/digest-gnome-terminal-2.18.2 271
 MD5 b515e82122d948ad7b8b4b84c58aea4d files/digest-gnome-terminal-2.18.3 271
 RMD160 914973f5a7650323946ec4993d800862962758c4 files/digest-gnome-terminal-2.18.3 271
 SHA256 6cac1a62b004d46ae1f8d9a8bf682cc17f5a1f3b01cfeae332cc65c497f12811 files/digest-gnome-terminal-2.18.3 271
+MD5 72785fccd7188e97116faa5615078b55 files/digest-gnome-terminal-2.18.4 271
+RMD160 d850ed4e0cf4fb6f9ad33b50573981d67d2ee7d2 files/digest-gnome-terminal-2.18.4 271
+SHA256 3cb5a74e0d9c5cb050c117342af30ba22a9269c3d7f87087e324674d1157bc39 files/digest-gnome-terminal-2.18.4 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHXm20p/wUKkr7RBoRAvTMAJ4/bmYRtvnzfPzCCFYhvWE1+G5zeQCgtRW1
-5ChT/5X4StIaR6YXWDtrtns=
-=RWHH
+iEYEARECAAYFAkeFQqQACgkQ1fmVwcYIWAbvhgCfZXtQHJV0GwWAUhqKGT/xYoDM
+GVoAoJmVteGwk7tCOlKJ77DsMYkkcxws
+=W/Qw
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.16.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.16.1
deleted file mode 100644
index e01c488d7fc8..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 861e1b780819214b4d5a398e7999c093 gnome-terminal-2.16.1.tar.bz2 1840537
-RMD160 a14799916a97d83e866b0245b4883438a57d94f6 gnome-terminal-2.16.1.tar.bz2 1840537
-SHA256 814ab099689aabdc6351565215ce6e5a2fc93e8b05fafd3ca70f4cefe167caf0 gnome-terminal-2.16.1.tar.bz2 1840537
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.1
deleted file mode 100644
index 0e0d15b83fca..000000000000
--- a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c1902cf4727f4cd976d6cc0beb1c03fe gnome-terminal-2.18.1.tar.bz2 1995096
-RMD160 fb99a2e42752ae67eda7e2b980c1127e104c849d gnome-terminal-2.18.1.tar.bz2 1995096
-SHA256 a66701d5c247c092d9b52ee2209cdb8094f5ce2ab339ee78738ccdb3a0b81cdb gnome-terminal-2.18.1.tar.bz2 1995096
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.4 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.4
new file mode 100644
index 000000000000..f682658b74e5
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.18.4
@@ -0,0 +1,3 @@
+MD5 e4429d66d0d2ede8e14756cfbc15d30a gnome-terminal-2.18.4.tar.bz2 2072290
+RMD160 0d4125cf7d4cf6f04b648f4fe10c623af84018b0 gnome-terminal-2.18.4.tar.bz2 2072290
+SHA256 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282 gnome-terminal-2.18.4.tar.bz2 2072290
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.15-tab-switching-no-resize.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.15-tab-switching-no-resize.patch
deleted file mode 100644
index 0d0a70b171f9..000000000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.15-tab-switching-no-resize.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/terminal-window.c	2006-05-25 12:31:18.000000000 -0500
-+++ -	2006-05-25 12:33:48.497915000 -0500
-@@ -1592,8 +1592,22 @@
-   if (window->priv->active_term == screen)
-     return;
-   
-+  /* Workaround to remove gtknotebook's feature of computing its size based on
-+   * all pages. When the widget is hidden, its size will not be taken into
-+   * account.
-+   */
-+  if (window->priv->active_term)
-+  {
-+    GtkWidget *old_widget;
-+    old_widget = terminal_screen_get_widget (window->priv->active_term);
-+    gtk_widget_hide (old_widget);
-+  }
-+  
-   widget = terminal_screen_get_widget (screen);
-   
-+  /* Make sure that the widget is no longer hidden due to the workaround */
-+  gtk_widget_show (widget);
-+
-   profile = terminal_screen_get_profile (screen);
- 
-   if (!GTK_WIDGET_REALIZED (widget))
-@@ -1684,11 +1698,7 @@
-   TerminalScreen *screen;
-   GtkWidget *menu_item;
-   int old_grid_width, old_grid_height;
--  GtkWidget *old_widget;
--  
--  old_widget = NULL;
--  old_grid_width = -1;
--  old_grid_height = -1;
-+  GtkWidget *old_widget, *new_widget;
- 
-   if (window->priv->active_term == NULL)
-     return;
-@@ -1704,17 +1714,13 @@
-   screen = TERMINAL_SCREEN (page_widget);
- 
-   g_assert (screen);
-+  
-+  /* This is so that we maintain the same grid */
-+  new_widget = terminal_screen_get_widget (screen);
-+  terminal_widget_set_size (new_widget, old_grid_width, old_grid_height);
- 
-   terminal_window_set_active (window, screen);
- 
--  /* This is so we maintain the same grid moving among tabs with
--   * different fonts.
--   */
--#ifdef DEBUG_GEOMETRY
--  g_fprintf (stderr,"setting size in switch_page handler\n");
--#endif
--  terminal_window_set_size_force_grid (window, screen, TRUE, old_grid_width, old_grid_height);
--  
-   update_tab_sensitivity (window);
-   
-   menu_item = screen_get_menuitem (screen);
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.16.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.16.1.ebuild
deleted file mode 100644
index 5f906b6911f7..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.16.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 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.16.1.ebuild,v 1.12 2007/06/26 03:00:33 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/xft
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.8
-	>=x11-libs/vte-0.13.4
-	>=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
-
-	# 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
-
-	# patch to prevent gnome-term from resizing its windows when
-	# switching tabs
-	# Gnome Bug http://bugzilla.gnome.org/show_bug.cgi?id=338913
-	# Using patch from http://bugzilla.gnome.org/show_bug.cgi?id=95316
-	epatch ${FILESDIR}/${PN}-2.15-tab-switching-no-resize.patch
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.18.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild
index ca44c1dd79c3..91c476b68833 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.18.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.18.1.ebuild,v 1.9 2007/09/22 09:01:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.18.4.ebuild,v 1.1 2008/01/09 21:54:40 eva Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/xft
@@ -35,17 +35,14 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Use login shell by default (#12900)
-	epatch ${FILESDIR}/${PN}-2-default_shell.patch
+	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
+	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.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
-
-	# Remove the intltoolize call when tarballs are made with >=intltool-0.35.5
-	intltoolize --force || die
 }