Version bump, closes bug #113268. Added patch to avoid running scrollkeeper_update and an upstream patch to fix the dbus breakage.

Package-Manager: portage-2.0.53

6 files changed, 156 insertions, 2 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index ec5d150a8746..64f26e4d52a7 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2005/11/03 07:33:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.8 2005/12/09 20:09:32 chainsaw Exp $
+
+*xchat-gnome-0.7 (09 Dec 2005)
+
+  09 Dec 2005; <chainsaw@gentoo.org> +files/xchat-gnome-0.7-dbus.patch,
+  +files/xchat-gnome-0.7-scrollkeeper.patch, +xchat-gnome-0.7.ebuild:
+  Version bump, closes bug #113268. Added patch to avoid running
+  scrollkeeper_update and an upstream patch to fix the dbus breakage.
 
 *xchat-gnome-0.6 (03 Nov 2005)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index 4100dc392516..099f5938ff89 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,8 +1,22 @@
-MD5 7e70c0c7efa546c90458e5832f63a3d5 ChangeLog 1130
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f3087c42db97c14eb269aca116cb6ef0 ChangeLog 1440
 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 69
+MD5 cf21778a2cac6a5ad0a81032f48583fd files/xchat-gnome-0.7-dbus.patch 1620
+MD5 c7599a8531a6130925ead14ec1489bc5 files/xchat-gnome-0.7-scrollkeeper.patch 386
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 ea5d21ed4c3fafc70d7aa442f7a64730 xchat-gnome-0.4.ebuild 1667
 MD5 56cd43f4d2579e3c7e7b26beb3c9b5fe xchat-gnome-0.5.ebuild 1667
 MD5 09539bbeae697f7de7b0352190ca4d02 xchat-gnome-0.6.ebuild 1739
+MD5 b2ac03dfaa7ad98ae9919438d00084e7 xchat-gnome-0.7.ebuild 1871
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDmeRGp5vW4rUFj5oRAinkAJ46hRKLkVC8ugq17Nk4IhAeOVG6UgCeODuz
+wnJM5ez7D5GiE/nbNxRsq1Q=
+=60P3
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7
new file mode 100644
index 000000000000..e168b382edbc
--- /dev/null
+++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7
@@ -0,0 +1 @@
+MD5 a5f0940ee6389d58222a04facca0aa0d xchat-gnome-0.7.tar.bz2 1396796
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
new file mode 100644
index 000000000000..9d65bbb5ff94
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.7-dbus.patch
@@ -0,0 +1,47 @@
+--- 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-scrollkeeper.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.7-scrollkeeper.patch
new file mode 100644
index 000000000000..4eee157e0758
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.7-scrollkeeper.patch
@@ -0,0 +1,10 @@
+--- src/fe-gnome/help/C/Makefile.in.orig	2005-12-09 19:58:06.000000000 +0000
++++ src/fe-gnome/help/C/Makefile.in	2005-12-09 20:00:36.000000000 +0000
+@@ -669,7 +669,6 @@
+ 	for file in $(omffile); do \
+ 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+-	-scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir)
+ 
+ uninstall-local-omf:
+ 	-for file in $(srcdir)/*.omf; do \
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild
new file mode 100644
index 000000000000..c97331d1ce0d
--- /dev/null
+++ b/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild
@@ -0,0 +1,75 @@
+# 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.ebuild,v 1.1 2005/12/09 20:09:32 chainsaw 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
+}
+
+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
+}