Version bump, bug 119968. Also fixes bug #121670 and #119209.

(Portage version: 2.1_pre4-r1)

8 files changed, 3 insertions, 66 deletions

diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.4 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.4
deleted file mode 100644
index c2fd77434f8a..000000000000
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a480e9af44fba6febb761d5a125d1cb xchat-gnome-0.4.tar.bz2 2200497
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.5 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.5
deleted file mode 100644
index 51b264ab80c6..000000000000
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b2a8a3abae883f68695d9bcf65a568b xchat-gnome-0.5.tar.bz2 2203619
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.6 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.6
deleted file mode 100644
index 26a9d2237383..000000000000
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef76823773da1e216c580cc0e289d2b4 xchat-gnome-0.6.tar.bz2 2191441
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1
deleted file mode 100644
index e168b382edbc..000000000000
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5f0940ee6389d58222a04facca0aa0d xchat-gnome-0.7.tar.bz2 1396796
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.8 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.8
deleted file mode 100644
index e0d7631ed6f2..000000000000
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 048f0bb530bc2afce43aff6eb9538554 xchat-gnome-0.8.tar.bz2 1160394
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.9 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.9
new file mode 100644
index 000000000000..ec0c340f04ab
--- /dev/null
+++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.9
@@ -0,0 +1,3 @@
+MD5 607d36afbadd35a163464b3f39c93526 xchat-gnome-0.9.tar.bz2 1187552
+RMD160 60fae4853ad9a6b0497897e6002a94e5b0bc05d8 xchat-gnome-0.9.tar.bz2 1187552
+SHA256 bc97fcfc8999b4f35c00688dbe1ae7255cd5900e9b9442d835d6cfc21279806e xchat-gnome-0.9.tar.bz2 1187552
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.7-dbus.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.7-dbus.patch
deleted file mode 100644
index 9d65bbb5ff94..000000000000
--- a/net-irc/xchat-gnome/files/xchat-gnome-0.7-dbus.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- plugins/dbus/dbus-plugin.c	2005-11-05 16:30:37.000000000 +0000
-+++ plugins/dbus/dbus-plugin.c	2005-12-09 19:31:39.000000000 +0000
-@@ -19,17 +19,22 @@
-  * x_claessens@skynet.be
-  */
- 
-+#include <config.h>
- #include <dbus/dbus-glib.h>
- #include "xchat-plugin.h"
- #include <glib/gi18n.h>
- 
- 
--#define PNAME "xchat remote access"
--#define PDESC "plugin for remote access using DBUS";
-+#define PNAME _("XChat-GNOME remote access")
-+#define PDESC _("plugin for remote access using DBUS")
- #define PVERSION "0.5"
- 
--#define DBUS_SERVICE "org.xchat.service"
--#define DBUS_OBJECT "/org/xchat/RemoteObject"
-+#define DBUS_SERVICE "org.xchatgnome.service"
-+#define DBUS_OBJECT "/org/xchatgnome/RemoteObject"
-+
-+void xchat_plugin_get_info(char **name, char **desc, char **version, void **reserved);
-+int  xchat_plugin_deinit(void);
-+int  xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg);
- 
- typedef struct RemoteObject RemoteObject;
- typedef struct RemoteObjectClass RemoteObjectClass;
-@@ -274,7 +279,7 @@
- 
-   if (!dbus_g_proxy_call (bus_proxy, "RequestName", &error,
-                           G_TYPE_STRING, DBUS_SERVICE,
--                          G_TYPE_UINT, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+                          G_TYPE_UINT, 0,
-                           G_TYPE_INVALID,
-                           G_TYPE_UINT, &request_name_result,
-                           G_TYPE_INVALID))
-@@ -300,7 +305,7 @@
- }
- 
- int
--xchat_plugin_deinit()
-+xchat_plugin_deinit(void)
- {
-   g_hash_table_destroy (hook_hash_table);
-   /* TODO: Close all D-BUS stuff */
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch
deleted file mode 100644
index 47fdfe4ca8fa..000000000000
--- a/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: navigation-tree.c
-===================================================================
---- src/fe-gnome/navigation-tree.c	(revision 9810)
-+++ src/fe-gnome/navigation-tree.c	(working copy)
-@@ -1060,6 +1060,9 @@
- 	gpointer *s;
- 	session *sess;
- 
-+	if (gui.server_tree == NULL)
-+		return;
-+
- 	treeview = GTK_TREE_VIEW (glade_xml_get_widget (gui.xml, "userlist"));
- 
- 	if (gui.server_tree->current_path != NULL)