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

(Portage version: 2.1_pre4-r1)

15 files changed, 63 insertions, 371 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index d02005a82014..2bcf1b1bd4f5 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/xchat-gnome
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.11 2005/12/29 12:54:38 swegener Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.12 2006/02/19 16:38:38 swegener Exp $
+
+*xchat-gnome-0.9 (19 Feb 2006)
+
+  19 Feb 2006; Sven Wegener <swegener@gentoo.org>
+  -files/xchat-gnome-0.7-dbus.patch, -files/xchat-gnome-0.7-segfault.patch,
+  -xchat-gnome-0.4.ebuild, -xchat-gnome-0.5.ebuild, -xchat-gnome-0.6.ebuild,
+  -xchat-gnome-0.7-r1.ebuild, -xchat-gnome-0.8.ebuild,
+  +xchat-gnome-0.9.ebuild:
+  Version bump, bug 119968. Also fixes bug #121670 and #119209.
 
 *xchat-gnome-0.8 (29 Dec 2005)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index f505b9bf58c4..52883bd9d16b 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,25 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 872b82d7673dd4dcd353f1a6961c6cda ChangeLog 1908
-MD5 6b74f53c26e12ea2bc55b54b33ada601 files/digest-xchat-gnome-0.4 69
-MD5 ba4f8ea248bc0fbcb776188ff3378f5f files/digest-xchat-gnome-0.5 69
-MD5 96c43ae259f40b55469226fdc18f26c9 files/digest-xchat-gnome-0.6 69
-MD5 6829fbc411f27e2883b18dcf6f3e784f files/digest-xchat-gnome-0.7-r1 69
-MD5 9f7efe4a5cf94ad623c6e1c0dc39dc7d files/digest-xchat-gnome-0.8 69
+RMD160 884723840d450d880d9dbd79ad3406517e874930 ChangeLog 1908
+SHA256 01e8b31ed6e3f6f32b03390aebfc35d73d51871ea8c343ae726383eefda68e84 ChangeLog 1908
+MD5 2d51e87791d2a55ebf26962530dc8d62 files/digest-xchat-gnome-0.4 253
+RMD160 bf25da314812feae1c859a1a0130533f74867685 files/digest-xchat-gnome-0.4 253
+SHA256 963e3f81cbbe52706fcb33266edc3323fd71565c9697e2a4d1cb364952765cbc files/digest-xchat-gnome-0.4 253
+MD5 6d383f6d16573b0162b8084c603f90bb files/digest-xchat-gnome-0.5 253
+RMD160 68e853ab690bdf7cf728763acb72c0d56d82d9e6 files/digest-xchat-gnome-0.5 253
+SHA256 dd55f133a009c2e2d98817df2435e98b9f309f02916422e33279722217c28a09 files/digest-xchat-gnome-0.5 253
+MD5 3d6b8086e5f3f4071519f2298f121d93 files/digest-xchat-gnome-0.6 253
+RMD160 67d888b423ecb6439c5c39d4b3ae0e1a75edcc95 files/digest-xchat-gnome-0.6 253
+SHA256 b863831455ac4ed8a803f2c439fa13d0c31f7676db87bb912c3e94015c3744ac files/digest-xchat-gnome-0.6 253
+MD5 faf0eb804d49b8607dd69c9e0eddc851 files/digest-xchat-gnome-0.7-r1 253
+RMD160 2ef1812b28707e6190daee753245d3cb5434c691 files/digest-xchat-gnome-0.7-r1 253
+SHA256 a89865503f61df0bf97ef328070f4f3ce48d89b17a7eb5795cc746d0afd48bf3 files/digest-xchat-gnome-0.7-r1 253
+MD5 883c57cee259236f79683d0119ecd800 files/digest-xchat-gnome-0.8 253
+RMD160 b1a88c9592b784a5282ea24cd23facd8da0713fc files/digest-xchat-gnome-0.8 253
+SHA256 8453c3e17697ce42927e0f8a91f173d88906c7489f89ef8eef178818c7fd74f2 files/digest-xchat-gnome-0.8 253
+MD5 c5e82da1d480886fc63fc2011b5389b3 files/digest-xchat-gnome-0.9 253
+RMD160 0a62933ffda8f7f80790f05a7f5f5e2f7db18021 files/digest-xchat-gnome-0.9 253
+SHA256 0601c3dc3e8b9cb2819a6921d8bcca4fbfec2a1775ed3e310131959a29cca3d0 files/digest-xchat-gnome-0.9 253
 MD5 cf21778a2cac6a5ad0a81032f48583fd files/xchat-gnome-0.7-dbus.patch 1620
+RMD160 955ef3bbb01eb616281a7cc8429fe14a69816cd6 files/xchat-gnome-0.7-dbus.patch 1620
+SHA256 7ff07645db5f99b1c8f48bd405f1e0c1702a411e58e74c67e14486a987319b8b files/xchat-gnome-0.7-dbus.patch 1620
 MD5 c7599a8531a6130925ead14ec1489bc5 files/xchat-gnome-0.7-scrollkeeper.patch 386
+RMD160 60b7b4ece62cc519f0d42d2c1a18f4a6ead70158 files/xchat-gnome-0.7-scrollkeeper.patch 386
+SHA256 b9c1b513c03819aa3ab65df551ed69d06214b4088a2cb70e7d4bd2490d4e0226 files/xchat-gnome-0.7-scrollkeeper.patch 386
 MD5 6cc0d3248f5cb2d9309392b9fa413d18 files/xchat-gnome-0.7-segfault.patch 414
+RMD160 4cc25da9167c863229d6f25cdca3ef125f3be88f files/xchat-gnome-0.7-segfault.patch 414
+SHA256 5a4c01729737c359c150c33e67bbb9777ce0ff6bfdfc86ae524e5495ecf9e955 files/xchat-gnome-0.7-segfault.patch 414
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
+SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
 MD5 ea5d21ed4c3fafc70d7aa442f7a64730 xchat-gnome-0.4.ebuild 1667
+RMD160 1ece0cfd33af54d7670016057f830dc5a276ff6f xchat-gnome-0.4.ebuild 1667
+SHA256 0d38f7f9c46138e1cba167b0d096930e6f614f66ecd2f8e1e64793f3e10a7723 xchat-gnome-0.4.ebuild 1667
 MD5 56cd43f4d2579e3c7e7b26beb3c9b5fe xchat-gnome-0.5.ebuild 1667
+RMD160 14ab9b85ee369da4ae3f11880a0d3800f7014845 xchat-gnome-0.5.ebuild 1667
+SHA256 2299a92f8e243da30a5d9c18dde664e8e7d850ebcc69e669f7e9a9269664354d xchat-gnome-0.5.ebuild 1667
 MD5 09539bbeae697f7de7b0352190ca4d02 xchat-gnome-0.6.ebuild 1739
+RMD160 f47dcc3a5b6ed8c1f0c704c4f44a385df0016243 xchat-gnome-0.6.ebuild 1739
+SHA256 d86c11ba562eb44345720559910289d8ceea318e7478829f295ec79e99117a36 xchat-gnome-0.6.ebuild 1739
 MD5 a7c39027ae8b98c23ac1f28316c86625 xchat-gnome-0.7-r1.ebuild 1902
+RMD160 97c7fbcc6368afb245bc2e2c8301bdc80d5bd901 xchat-gnome-0.7-r1.ebuild 1902
+SHA256 fa3c8ef1002a2d02fc5c53a550c9650ec2f1565fab99a26f3e0bc6a09c013509 xchat-gnome-0.7-r1.ebuild 1902
 MD5 9df7885cb0444e197d5c5c1ea8ff4a79 xchat-gnome-0.8.ebuild 1829
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs9yXI1lqEGTUzyQRAhblAKC0jqDxgDQ9/IftWliB2B/MISQWEgCcCW9s
-Jl3vxlzu8Odg9Qv91kQXWPw=
-=2GNo
------END PGP SIGNATURE-----
+RMD160 62f617001ebd5bb773d856e9bfddf199d817f4c4 xchat-gnome-0.8.ebuild 1829
+SHA256 d9809b1577629476d518f96134a6bcbf4bfd6ffb6ea59a225431e84b8219022f xchat-gnome-0.8.ebuild 1829
+MD5 fffbcdac4acce45c96a3c45b20f6b76d xchat-gnome-0.9.ebuild 1864
+RMD160 0f86fb00bee7af785b500989d415628b2f4d815d xchat-gnome-0.9.ebuild 1864
+SHA256 b72a3d05eace9db54fa507827053c7a5756b3a3acb51c8bfa71686916ea6c71e xchat-gnome-0.9.ebuild 1864
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)
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild
deleted file mode 100644
index fa4fd9a3057b..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild,v 1.6 2005/06/26 16:39:25 chainsaw Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="perl tcltk python ssl mmx ipv6 nls"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )
-	!net-irc/xchat"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
-	econf \
-		--disable-textfe \
-		--disable-gtkfe \
-		--enable-gnomefe \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcltk tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install"
-
-	rm -f \
-		"${D}"/usr/share/applications/xchat.desktop \
-		"${D}"/usr/share/pixmaps/xchat.png
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild
deleted file mode 100644
index 1c7bfa5cc000..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild,v 1.1 2005/08/28 12:06:10 chainsaw Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="perl tcltk python ssl mmx ipv6 nls"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )
-	!net-irc/xchat"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
-	econf \
-		--disable-textfe \
-		--disable-gtkfe \
-		--enable-gnomefe \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcltk tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install"
-
-	rm -f \
-		"${D}"/usr/share/applications/xchat.desktop \
-		"${D}"/usr/share/pixmaps/xchat.png
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild
deleted file mode 100644
index 38416cfffb43..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild,v 1.1 2005/11/03 07:33:46 swegener Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="perl tcltk python ssl mmx ipv6 nls"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	!net-irc/xchat"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
-	econf \
-		--disable-textfe \
-		--disable-gtkfe \
-		--enable-gnomefe \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcltk tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable dbus) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install"
-
-	rm -f \
-		"${D}"/usr/share/applications/xchat.desktop \
-		"${D}"/usr/share/pixmaps/xchat.png
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild
deleted file mode 100644
index a10dc9c4eafd..000000000000
--- a/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild,v 1.2 2005/12/29 12:32:01 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
-HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="perl tcltk python ssl mmx ipv6 nls dbus"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	!net-irc/xchat"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-dbus.patch
-	epatch ${FILESDIR}/${P}-scrollkeeper.patch
-	epatch ${FILESDIR}/${P}-segfault.patch
-}
-
-src_compile() {
-	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
-	econf \
-		--disable-textfe \
-		--disable-gtkfe \
-		--enable-gnomefe \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcltk tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable dbus) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install"
-
-	rm -f \
-		"${D}"/usr/share/applications/xchat.desktop \
-		"${D}"/usr/share/pixmaps/xchat.png
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc src/fe-gnome/ChangeLog || die "dodoc failed"
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.8.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.9.ebuild
index 600685850a87..b5a7aec6df9e 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.8.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.9.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.8.ebuild,v 1.1 2005/12/29 12:54:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.9.ebuild,v 1.1 2006/02/19 16:38:38 swegener Exp $
 
 inherit gnome2 eutils
 
 DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
 HOMEPAGE="http://xchat-gnome.navi.cx/"
-SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
+SRC_URI="http://releases.navi.cx/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,12 +19,13 @@ RDEPEND=">=dev-libs/glib-2.0.3
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-vfs-2
+	>=x11-libs/gtk+-2.8
+	>=x11-libs/libsexy-0.1.4
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( dev-lang/python )
 	tcltk? ( dev-lang/tcl )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	!net-irc/xchat"
+	dbus? ( >=sys-apps/dbus-0.35 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7
@@ -37,10 +38,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
 	econf \
-		--disable-textfe \
-		--disable-gtkfe \
 		--enable-gnomefe \
 		--enable-shm \
 		$(use_enable ssl openssl) \
@@ -58,15 +56,11 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install"
 
-	rm -f \
-		"${D}"/usr/share/applications/xchat.desktop \
-		"${D}"/usr/share/pixmaps/xchat.png
-
 	# install plugin development header
-	insinto /usr/include/xchat
+	insinto /usr/include/xchat-gnome
 	doins src/common/xchat-plugin.h || die "doins failed"
 
-	dodoc AUTHORS ChangeLog || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
 }
 
 pkg_postinst() {