New release, mark 2.0.5-r1 x86 'n cleanup

7 files changed, 18 insertions, 436 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 3b56d560909e..e326b7247b34 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.72 2003/11/23 05:09:14 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.73 2003/11/28 22:30:51 foser Exp $
+
+*xchat-2.0.6 (28 Nov 2003)
+
+  28 Nov 2003; foser <foser@gentoo.org> xchat-2.0.6.ebuild :
+  New release
 
 *xchat-2.0.5-r1 (23 Nov 2003)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 9b0938ea9f1a..cff945677e09 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,19 +1,16 @@
-MD5 6bcf2fd877030800c15a419f0e9991af xchat-2.0.6.ebuild 1978
+MD5 49bc450041164b33decb74774522afab xchat-2.0.6.ebuild 1987
 MD5 b424d2740a1f93cdc3f306461b4cf778 xchat-2.0.1.ebuild 1946
 MD5 4887bbd6f7df0f18b5aebc93850c6cf4 xchat-1.8.11.ebuild 2213
-MD5 6a93f14b4104d5e69a65614d07546583 xchat-2.0.5-r1.ebuild 2103
-MD5 e09e7c7a11448b323c9381343d21285a xchat-2.0.5.ebuild 1977
+MD5 30e4b5ee1fadd90c996c290af789b3fc xchat-2.0.5-r1.ebuild 2104
 MD5 5560dba63d7b69569420abc72d653f03 xchat-2.0.4.ebuild 2010
-MD5 d1772465b4916faada870254accd6231 ChangeLog 10447
+MD5 a58b095ce7a096e3a353b585e36bc59c ChangeLog 10553
 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
 MD5 785881948431e9b5cc0fd90ccbd997e9 xchat-2.0.3-r1.ebuild 1915
 MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64
 MD5 73e096b33cdb2fff840d34ecc8d7c3bb files/digest-xchat-2.0.4 64
-MD5 dc4dfe00cc6b978d3d8f8bd7bc70643e files/digest-xchat-2.0.5 64
 MD5 1c19b8dfe0dfe3574cb74726f3f04466 files/digest-xchat-2.0.6 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
 MD5 e470c6b909112da5b80be6880e56c8c3 files/xchat-2.0.3-fix_cps.patch 438
-MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367
 MD5 39046393ec7b906b8c53126ab78e6b54 files/xc205-fix64bit.diff 1471
 MD5 ecfeedae2da4ba7867a2f62227db355b files/xchat-2.0.3-fix_tint.patch 558
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
diff --git a/net-irc/xchat/files/00_all_tabs-leftright-and-gtk-icons.patch b/net-irc/xchat/files/00_all_tabs-leftright-and-gtk-icons.patch
deleted file mode 100644
index e86405a0ebef..000000000000
--- a/net-irc/xchat/files/00_all_tabs-leftright-and-gtk-icons.patch
+++ /dev/null
@@ -1,424 +0,0 @@
-diff -urw xchat-2.0.0pre1/src/fe-gtk/fe-gtk.h xchat-2.0.0pre1-patched/src/fe-gtk/fe-gtk.h
---- xchat-2.0.0pre1/src/fe-gtk/fe-gtk.h	2003-01-01 07:08:05.000000000 +0100
-+++ xchat-2.0.0pre1-patched/src/fe-gtk/fe-gtk.h	2003-02-03 04:00:12.000000000 +0100
-@@ -114,6 +114,7 @@
- 		*topic_entry,
- 		*note_book,
- 		*main_vbox,	/* container in TOPLEVEL window */
-+		*main_table,
- 		*user_tree,	/* GtkTreeView */
- 		*user_box,
- 		*button_box_parent,
-diff -urw xchat-2.0.0pre1/src/fe-gtk/maingui.c xchat-2.0.0pre1-patched/src/fe-gtk/maingui.c
---- xchat-2.0.0pre1/src/fe-gtk/maingui.c	2003-01-26 05:15:47.000000000 +0100
-+++ xchat-2.0.0pre1-patched/src/fe-gtk/maingui.c	2003-02-03 04:28:48.000000000 +0100
-@@ -1723,6 +1723,9 @@
- static void
- mg_set_tabs_pos (session_gui *gui, int pos)
- {
-+	GtkOrientation orientation;
-+	GtkWidget *new_tabs_box;
-+
- 	if (!gui)
- 	{
- 		gui = mg_gui;
-@@ -1730,23 +1733,42 @@
- 			return;
- 	}
- 
-+	gtk_widget_ref (gui->tabs_box);
-+	gtk_container_remove (GTK_CONTAINER (gui->main_table), gui->tabs_box);
-+
-+	orientation = tab_group_get_orientation (gui->tabs_box);
-+	if ((pos == 0 || pos == 1) && orientation == GTK_ORIENTATION_VERTICAL)
-+	{
-+		new_tabs_box = tab_group_set_orientation (gui->tabs_box, FALSE);
-+		gtk_widget_unref (gui->tabs_box);
-+		gui->tabs_box = new_tabs_box;
-+	} else if((pos == 2 || pos == 3) && orientation == GTK_ORIENTATION_HORIZONTAL) {
-+		new_tabs_box = tab_group_set_orientation (gui->tabs_box, TRUE);
-+		gtk_widget_unref (gui->tabs_box);
-+		gui->tabs_box = new_tabs_box;
-+	}
-+
- 	gtk_widget_show (gui->tabs_box);
- 
- 	switch (pos)
- 	{
- 	case 0: /* bottom */
--		gtk_box_reorder_child (GTK_BOX (gui->main_vbox), gui->tabs_box, 9);
-+		gtk_table_attach (GTK_TABLE (gui->main_table), gui->tabs_box,
-+							1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
- 		break;
- 	case 1: /* top */
--		gtk_box_reorder_child (GTK_BOX (gui->main_vbox), gui->tabs_box, 1);
-+		gtk_table_attach (GTK_TABLE (gui->main_table), gui->tabs_box,
-+							1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
- 		break;
--#if 0
- 	case 2: /* left */
-+		gtk_table_attach (GTK_TABLE (gui->main_table), gui->tabs_box,
-+							0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
- 		break;
- 	case 3: /* right */
-+		gtk_table_attach (GTK_TABLE (gui->main_table), gui->tabs_box,
-+							2, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
- 		break;
--#endif
--	case 2: /* hidden */
-+	case 4: /* hidden */
- 		gtk_widget_hide (gui->tabs_box);
- 		break;
- 	}
-@@ -1824,7 +1846,8 @@
- 		vert = TRUE;
- 
- 	gui->tabs_box = tab_group_new (mg_switch_tab_cb, vert);
--	gtk_box_pack_start (GTK_BOX (box), gui->tabs_box, 0, 0, 0);
-+	gtk_table_attach (GTK_TABLE (gui->main_table), gui->tabs_box,
-+						1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
- }
- 
- static gboolean
-@@ -1993,6 +2016,7 @@
- {
- 	GtkWidget *win;
- 	GtkWidget *vbox;
-+	GtkWidget *table;
- 	GtkWidget *book;
- 
- 	win = gtkutil_window_new ("X-Chat ["VERSION"]", prefs.mainwindow_width,
-@@ -2018,10 +2042,14 @@
- 	sess->gui->main_vbox = vbox = gtk_vbox_new (FALSE, 1);
- 	gtk_container_add (GTK_CONTAINER (win), vbox);
- 
-+	sess->gui->main_table = table = gtk_table_new (3, 3, FALSE);
-+	gtk_container_add (GTK_CONTAINER (vbox), table);
-+
- 	sess->gui->note_book = book = gtk_notebook_new ();
- 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (book), FALSE);
- 	gtk_notebook_set_show_border (GTK_NOTEBOOK (book), FALSE);
--	gtk_container_add (GTK_CONTAINER (vbox), book);
-+	gtk_table_attach (GTK_TABLE (table), book, 1, 2, 1, 2,
-+						GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
- 
- 	mg_create_irctab (sess, book);
- 	mg_create_tabs (sess->gui, vbox);
-@@ -2029,13 +2057,14 @@
- 
- 	mg_focus (sess);
- 
--	if (prefs.tabs_position != 0)
-+	if (prefs.tabs_position != 1)
- 		mg_set_tabs_pos (sess->gui, prefs.tabs_position);
- 
- 	if (!prefs.hidemenu)
- 		gtk_widget_show (sess->gui->menu);
- 
- 	gtk_widget_show (vbox);
-+	gtk_widget_show (table);
- 	gtk_widget_show_all (book);
- 
- 	if (prefs.hideuserlist)
-diff -urw xchat-2.0.0pre1/src/fe-gtk/setup.c xchat-2.0.0pre1-patched/src/fe-gtk/setup.c
---- xchat-2.0.0pre1/src/fe-gtk/setup.c	2003-01-08 06:56:58.000000000 +0100
-+++ xchat-2.0.0pre1-patched/src/fe-gtk/setup.c	2003-02-03 04:00:12.000000000 +0100
-@@ -145,8 +145,8 @@
- {
- 	N_("Bottom"),
- 	N_("Top"),
--/*	N_("Left"),
--	N_("Right"),*/
-+	N_("Left"),
-+	N_("Right"),
- 	N_("Hidden"),
- 	NULL
- };
-diff -urw xchat-2.0.0pre1/src/fe-gtk/tabs.c xchat-2.0.0pre1-patched/src/fe-gtk/tabs.c
---- xchat-2.0.0pre1/src/fe-gtk/tabs.c	2003-01-18 03:43:43.000000000 +0100
-+++ xchat-2.0.0pre1-patched/src/fe-gtk/tabs.c	2003-02-03 04:20:13.000000000 +0100
-@@ -3,6 +3,7 @@
- #include <string.h>
- 
- #include <gtk/gtkhbox.h>
-+#include <gtk/gtkvbox.h>
- #include <gtk/gtktogglebutton.h>
- #include <gtk/gtkwidget.h>
- #include <gtk/gtkcontainer.h>
-@@ -12,6 +13,7 @@
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkviewport.h>
- #include <gtk/gtkvseparator.h>
-+#include <gtk/gtkarrow.h>
- 
- /* keep this code generic, don't include xchat.h! */
- 
-@@ -49,17 +51,20 @@
- static void
- tab_viewport_size_request (GtkWidget *widget, GtkRequisition *requisition, gpointer user_data)
- {
-+	if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (user_data), "v")) == 0)
- 	requisition->width = 1;
- 	requisition->height = 1;
- }
- 
- static gint
--tab_search_offset (GtkWidget *inner, gint start_offset, gboolean forward)
-+tab_search_offset (GtkWidget *inner, gint start_offset,
-+				   gboolean forward, gboolean vertical)
- {
- 	GList *boxes;
- 	GList *tabs;
- 	GtkWidget *box;
- 	GtkWidget *button;
-+	gint found;
- 
- 	boxes = GTK_BOX (inner)->children;
- 	if (!forward && boxes)
-@@ -82,9 +87,10 @@
- 			if (!GTK_IS_TOGGLE_BUTTON (button))
- 				continue;
- 
--			if ((forward && button->allocation.x > start_offset) ||
--			    (!forward && button->allocation.x < start_offset))
--				return button->allocation.x;
-+			found = (vertical ? button->allocation.y : button->allocation.x);
-+			if ((forward && found > start_offset) ||
-+				(!forward && found < start_offset))
-+				return found;
- 		}
- 	}
- 
-@@ -92,21 +98,32 @@
- }
- 
- static void
--tab_scroll_left_clicked (GtkWidget *widget, GtkWidget *group)
-+tab_scroll_left_up_clicked (GtkWidget *widget, GtkWidget *group)
- {
- 	GtkAdjustment *adj;
--	gint viewport_width;
-+	gint viewport_size;
- 	gfloat new_value;
- 	GtkWidget *inner;
-+	gint vertical;
- 	gfloat i;
- 
- 	inner = g_object_get_data (G_OBJECT (group), "i");
-+	vertical = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group), "v"));
-+
-+	if (vertical)
-+	{
-+		adj = gtk_viewport_get_vadjustment (GTK_VIEWPORT (inner->parent));
-+		gdk_window_get_geometry (inner->parent->window, 0, 0, 0, &viewport_size, 0);
-+	} else
-+	{
- 	adj = gtk_viewport_get_hadjustment (GTK_VIEWPORT (inner->parent));
--	gdk_window_get_geometry (inner->parent->window, 0, 0, &viewport_width, 0, 0);
--	new_value = tab_search_offset (inner, adj->value, 0);
-+		gdk_window_get_geometry (inner->parent->window, 0, 0, &viewport_size, 0, 0);
-+	}
-+
-+	new_value = tab_search_offset (inner, adj->value, 0, vertical);
- 
--	if (new_value + viewport_width > adj->upper)
--		new_value = adj->upper - viewport_width;
-+	if (new_value + viewport_size > adj->upper)
-+		new_value = adj->upper - viewport_size;
- 
- 	for (i = adj->value; i > new_value; i -= 0.1)
- 	{
-@@ -119,21 +136,32 @@
- }
- 
- static void
--tab_scroll_right_clicked (GtkWidget *widget, GtkWidget *group)
-+tab_scroll_right_down_clicked (GtkWidget *widget, GtkWidget *group)
- {
- 	GtkAdjustment *adj;
--	gint viewport_width;
-+	gint viewport_size;
- 	gfloat new_value;
- 	GtkWidget *inner;
-+	gint vertical;
- 	gfloat i;
- 
- 	inner = g_object_get_data (G_OBJECT (group), "i");
-+	vertical = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group), "v"));
-+
-+	if (vertical)
-+	{
-+		adj = gtk_viewport_get_vadjustment (GTK_VIEWPORT (inner->parent));
-+		gdk_window_get_geometry (inner->parent->window, 0, 0, 0, &viewport_size, 0);
-+	} else
-+	{
- 	adj = gtk_viewport_get_hadjustment (GTK_VIEWPORT (inner->parent));
--	gdk_window_get_geometry (inner->parent->window, 0, 0, &viewport_width, 0, 0);
--	new_value = tab_search_offset (inner, adj->value, 1);
-+		gdk_window_get_geometry (inner->parent->window, 0, 0, &viewport_size, 0, 0);
-+	}
-+
-+	new_value = tab_search_offset (inner, adj->value, 1, vertical);
- 
--	if (new_value == 0 || new_value + viewport_width > adj->upper)
--		new_value = adj->upper - viewport_width;
-+	if (new_value == 0 || new_value + viewport_size > adj->upper)
-+		new_value = adj->upper - viewport_size;
- 
- 	for (i = adj->value; i < new_value; i += 0.1)
- 	{
-@@ -178,7 +206,7 @@
- 	GtkWidget *box;
- 	GtkWidget *viewport;
- 	GtkWidget *group;
--	GtkWidget *button;
-+	GtkWidget *button, *arrow;
- 
- 	if (vertical)
- 	{
-@@ -192,7 +220,7 @@
- 	viewport = gtk_viewport_new (0, 0);
- 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
- 	g_signal_connect (G_OBJECT (viewport), "size_request",
--							G_CALLBACK (tab_viewport_size_request), 0);
-+							G_CALLBACK (tab_viewport_size_request), group);
- 	gtk_box_pack_start (GTK_BOX (group), viewport, 1, 1, 0);
- 	gtk_widget_show (viewport);
- 
-@@ -204,17 +232,26 @@
- 	gtk_container_add (GTK_CONTAINER (viewport), box);
- 	gtk_widget_show (box);
- 
--	button = gtk_button_new_with_label (">");
-+	
-+	// button = gtk_button_new_with_label (vertical ? "v" : ">");
-+	button = gtk_button_new ();
-+	arrow = gtk_arrow_new (vertical ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT , GTK_SHADOW_NONE);
-+	gtk_container_add (GTK_CONTAINER (button), arrow);
-+	gtk_widget_show (arrow);
- 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- 	g_signal_connect (G_OBJECT (button), "clicked",
--							G_CALLBACK (tab_scroll_right_clicked), group);
-+							G_CALLBACK (tab_scroll_right_down_clicked), group);
- 	gtk_widget_show (button);
- 	gtk_box_pack_end (GTK_BOX (group), button, 0, 0, 0);
- 
--	button = gtk_button_new_with_label ("<");
-+	// button = gtk_button_new_with_label (vertical ? "^" : "<");
-+	button = gtk_button_new ();
-+	arrow = gtk_arrow_new (vertical ? GTK_ARROW_UP : GTK_ARROW_LEFT, GTK_SHADOW_NONE);
-+	gtk_container_add (GTK_CONTAINER (button), arrow);
-+	gtk_widget_show (arrow);
- 	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- 	g_signal_connect (G_OBJECT (button), "clicked",
--							G_CALLBACK (tab_scroll_left_clicked), group);
-+							G_CALLBACK (tab_scroll_left_up_clicked), group);
- 	gtk_widget_show (button);
- 	gtk_box_pack_end (GTK_BOX (group), button, 0, 0, 0);
- 
-@@ -451,6 +488,7 @@
- 		if (g_object_get_data (G_OBJECT (box), "f") == family)
- 		{
- 			tab_add_sorted (box, tab);
-+			gtk_widget_queue_resize (inner->parent);
- 			return;
- 		}
- 
-@@ -499,6 +537,7 @@
- 	gtk_box_pack_start (GTK_BOX (box), tab, 0, 0, 0);
- 	gtk_widget_show (tab);
- 	gtk_widget_show (box);
-+	gtk_widget_queue_resize (inner->parent);
- }
- 
- static void
-@@ -577,6 +616,7 @@
- tab_rename (GtkWidget *tab, char *new_name)
- {
- 	gtk_button_set_label (GTK_BUTTON (tab), new_name);
-+	gtk_widget_queue_resize (tab->parent->parent->parent);
- }
- 
- void
-@@ -616,3 +656,69 @@
- 		tab_group_switch (group, 0, FALSE);
- 	}
- }
-+
-+GtkOrientation
-+tab_group_get_orientation (GtkWidget *group)
-+{
-+	int vertical;
-+	vertical = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group), "v"));
-+	return (vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
-+}
-+
-+GtkWidget *
-+tab_group_set_orientation (GtkWidget *group, gboolean vertical)
-+{
-+	GtkWidget *box;
-+	GtkWidget *new_group;
-+	GList *boxes;
-+	int is_vertical;
-+
-+	is_vertical = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group), "v"));
-+	if ((vertical && is_vertical) || (!vertical && !is_vertical))
-+		return group;
-+
-+	new_group = tab_group_new (g_object_get_data (G_OBJECT (group), "c"),
-+								vertical);
-+	g_object_set_data (G_OBJECT (new_group), "foc",
-+						g_object_get_data (G_OBJECT (group), "foc"));
-+	box = g_object_get_data (G_OBJECT (group), "i");
-+	boxes = GTK_BOX (box)->children;
-+	while (boxes)
-+	{
-+		GtkWidget *family_box;
-+		GList *children;
-+
-+		family_box = ((GtkBoxChild *) boxes->data)->widget;
-+		children = GTK_BOX (family_box)->children;
-+
-+		while (children)
-+		{
-+			GtkWidget *child;
-+
-+			child = ((GtkBoxChild *) children->data)->widget;
-+
-+			if (GTK_IS_TOGGLE_BUTTON (child))
-+			{
-+				void *family;
-+
-+				gtk_widget_ref (child);
-+				gtk_container_remove (GTK_CONTAINER (family_box), child);
-+				g_signal_handlers_disconnect_by_func (G_OBJECT (child),
-+									G_CALLBACK (tab_pressed_cb), group);
-+				g_signal_connect (G_OBJECT (child), "pressed",
-+									G_CALLBACK (tab_pressed_cb), new_group);
-+				family = g_object_get_data (G_OBJECT (child), "f");
-+				g_object_set_data (G_OBJECT (child), "g", new_group);
-+				tab_add_real (new_group, child, family);
-+				gtk_widget_unref (child);
-+				children = GTK_BOX (family_box)->children;
-+			} else
-+				children = children->next;
-+		}
-+
-+		boxes = boxes->next;
-+	}
-+
-+	return new_group;
-+}
-+
-diff -urw xchat-2.0.0pre1/src/fe-gtk/tabs.h xchat-2.0.0pre1-patched/src/fe-gtk/tabs.h
---- xchat-2.0.0pre1/src/fe-gtk/tabs.h	2002-12-25 14:03:10.000000000 +0100
-+++ xchat-2.0.0pre1-patched/src/fe-gtk/tabs.h	2003-02-03 04:00:12.000000000 +0100
-@@ -3,6 +3,8 @@
- void tab_group_cleanup (GtkWidget *group);
- int tab_group_get_size (GtkWidget *group);
- GtkWidget *tab_group_add (GtkWidget *group, char *name, void *family, void *userdata, void *click_cb);
-+GtkOrientation tab_group_get_orientation (GtkWidget *group);
-+GtkWidget *tab_group_set_orientation (GtkWidget *group, gboolean vertical);
- 
- void tab_focus (GtkWidget *tab);
- void tab_rename (GtkWidget *tab, char *new_name);
diff --git a/net-irc/xchat/files/digest-xchat-2.0.5 b/net-irc/xchat/files/digest-xchat-2.0.5
deleted file mode 100644
index 1b857ff4f118..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a594ed57287a9fb212425ecba8d5401 xchat-2.0.5.tar.bz2 902581
diff --git a/net-irc/xchat/files/digest-xchat-2.0.6 b/net-irc/xchat/files/digest-xchat-2.0.6
new file mode 100644
index 000000000000..89a4b9ec84bc
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.0.6
@@ -0,0 +1 @@
+MD5 5cc5e603083242fb598bc940b1a4fccc xchat-2.0.6.tar.bz2 942837
diff --git a/net-irc/xchat/xchat-2.0.5-r1.ebuild b/net-irc/xchat/xchat-2.0.5-r1.ebuild
index 1075f22c17b5..9f9de3fb12f1 100644
--- a/net-irc/xchat/xchat-2.0.5-r1.ebuild
+++ b/net-irc/xchat/xchat-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.5-r1.ebuild,v 1.1 2003/11/23 05:09:15 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.5-r1.ebuild,v 1.2 2003/11/28 22:30:51 foser Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 IUSE="perl tcltk python ssl mmx ipv6 nls"
 # Local use flag for the text frontend (bug #26427)
 IUSE="${IUSE} xchattext xchatnogtk"
diff --git a/net-irc/xchat/xchat-2.0.5.ebuild b/net-irc/xchat/xchat-2.0.6.ebuild
index 98b034954ede..d4372579314b 100644
--- a/net-irc/xchat/xchat-2.0.5.ebuild
+++ b/net-irc/xchat/xchat-2.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.5.ebuild,v 1.3 2003/10/05 10:40:30 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.6.ebuild,v 1.1 2003/11/28 22:30:51 foser Exp $
 
-inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="Graphical IRC client"
 SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2"
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7"
 
 src_compile() {
+
 	# xchat's configure script uses sys.path to find library path
 	# instead of python-config (#25943)
 	unset PYTHONPATH
@@ -58,9 +59,11 @@ src_compile() {
 		|| die "Configure failed"
 
 	MAKEOPTS="-j1" emake || die "Compile failed"
+
 }
 
 src_install() {
+
 	# some magic to create a menu entry for xchat 2
 	mv xchat.desktop xchat.desktop.old
 	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
@@ -72,4 +75,5 @@ src_install() {
 	doins src/common/xchat-plugin.h
 
 	dodoc AUTHORS COPYING ChangeLog README*
+
 }