Version bump, bug #118071.

(Portage version: 2.0.54)

7 files changed, 12 insertions, 93 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index d7bd31049ffb..45a7c0208f33 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.189 2006/01/02 07:11:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.190 2006/01/07 12:06:12 swegener Exp $
+
+*xchat-2.6.1 (07 Jan 2006)
+
+  07 Jan 2006; Sven Wegener <swegener@gentoo.org>
+  -files/2.6.0-dbus-0.60-support.patch, -files/xc260-fix-fetext.diff,
+  -xchat-2.6.0.ebuild, +xchat-2.6.1.ebuild:
+  Version bump, bug #118071.
 
   02 Jan 2006; Sven Wegener <swegener@gentoo.org>
   +files/2.6.0-dbus-0.60-support.patch, xchat-2.6.0.ebuild:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 09ac2e837f23..9f04ce88c975 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,19 +1,17 @@
 MD5 b5a470bfa9441adec40484fefc6079ed ChangeLog 28025
-MD5 ee907319c2fd838bd17ff65fd6dc343a files/2.6.0-dbus-0.60-support.patch 684
 MD5 6354e2efb6f0d1323ad8849be7303575 files/44_fix_alignment_endianess.dpatch 8676
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
 MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
 MD5 c5d53c24b3ebfec1f168930213f55fea files/digest-xchat-2.4.5 65
 MD5 c5d53c24b3ebfec1f168930213f55fea files/digest-xchat-2.4.5-r1 65
-MD5 02c31b272038e119a3ce2d4a79897f72 files/digest-xchat-2.6.0 64
+MD5 037d18f28c5ce37faeff29e7994246ca files/digest-xchat-2.6.1 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
 MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 17073299c8c2c65062ad2e77cd03b841 files/xc245-fix-te-notify.diff 403
-MD5 6bfc06df4986a7fb482525e1dfd8fa21 files/xc260-fix-fetext.diff 1123
 MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264
 MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
 MD5 1d96b6a159995e2ba2d2a95ca9b17df1 xchat-2.4.5-r1.ebuild 2362
 MD5 b07304c2f6e1aa08bf112928e9558223 xchat-2.4.5.ebuild 2301
-MD5 9a7b105b973c5f9648fe1aac00126176 xchat-2.6.0.ebuild 2315
+MD5 ea4588626ec6890838b35e06ab1bd420 xchat-2.6.1.ebuild 2218
diff --git a/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch b/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch
deleted file mode 100644
index 43e036632ed8..000000000000
--- a/net-irc/xchat/files/2.6.0-dbus-0.60-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- plugins/dbus/dbus-plugin.c.orig	2006-01-02 07:03:53.323758200 +0000
-+++ plugins/dbus/dbus-plugin.c	2006-01-02 07:03:29.542130167 +0000
-@@ -152,7 +152,12 @@
- 
-   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,
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+			  DBUS_NAME_FLAG_DO_NOT_QUEUE,
-+#else
-+			  DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+#endif
-                           G_TYPE_INVALID,
-                           G_TYPE_UINT, &request_name_result,
-                           G_TYPE_INVALID))
diff --git a/net-irc/xchat/files/digest-xchat-2.6.0 b/net-irc/xchat/files/digest-xchat-2.6.0
deleted file mode 100644
index 1a29c66064d6..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0c827bf6df0572231cbbb1e25965fb61 xchat-2.6.0.tar.bz2 796768
diff --git a/net-irc/xchat/files/digest-xchat-2.6.1 b/net-irc/xchat/files/digest-xchat-2.6.1
new file mode 100644
index 000000000000..0e2a996fd480
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.1
@@ -0,0 +1 @@
+MD5 50fbc65bf9c051029ea081cf497493f3 xchat-2.6.1.tar.bz2 996111
diff --git a/net-irc/xchat/files/xc260-fix-fetext.diff b/net-irc/xchat/files/xc260-fix-fetext.diff
deleted file mode 100644
index 5322ab7f457e..000000000000
--- a/net-irc/xchat/files/xc260-fix-fetext.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Fix for building xchat 2.6.0 with ./configure --enable-textfe
-#
---- xchat-2.6.0/src/fe-text/fe-text.c	28 Sep 2005 07:49:46 -0000	1.26
-+++ xchat-2.6.0p1/src/fe-text/fe-text.c	4 Nov 2005 03:19:46 -0000
-@@ -109,12 +109,6 @@
- 	fe_print_text (sess, buf);
- 
- 	fe_print_text (sess, "\n\nCompiled in Features\0032:\017 "
--#ifdef USE_PERL
--	"Perl "
--#endif
--#ifdef USE_PYTHON
--	"Python "
--#endif
- #ifdef USE_PLUGIN
- 	"Plugin "
- #endif
-@@ -124,9 +118,6 @@
- #ifdef USE_OPENSSL
- 	"OpenSSL "
- #endif
--#ifdef SOCKS
--	"Socks5 "
--#endif
- #ifdef USE_IPV6
- 	"IPv6"
- #endif
-@@ -406,7 +397,7 @@
- 			return 0;
- 		}
- 	}
--	return 1;
-+	return -1;
- }
- 
- void
-@@ -557,7 +548,7 @@
- }
- 
- void
--fe_message (char *msg, int wait)
-+fe_message (char *msg, int flags)
- {
- 	puts (msg);
- }
-@@ -565,7 +556,7 @@
- void
- fe_close_window (struct session *sess)
- {
--	kill_session_callback (sess);
-+	session_free (sess);
- 	done = TRUE;
- }
- 
-@@ -803,6 +794,11 @@
- {
- 	return -1;
- }
-+void *
-+fe_gui_info_ptr (session *sess, int info_type)
-+{
-+	return NULL;
-+}
- void fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *), void *ud)
- {
- }
diff --git a/net-irc/xchat/xchat-2.6.0.ebuild b/net-irc/xchat/xchat-2.6.1.ebuild
index 93aefde7b2ec..7b1cbd24f6ed 100644
--- a/net-irc/xchat/xchat-2.6.0.ebuild
+++ b/net-irc/xchat/xchat-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.6 2006/01/02 07:11:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.1.ebuild,v 1.1 2006/01/07 12:06:12 swegener Exp $
 
 inherit eutils versionator
 
@@ -37,9 +37,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/xc260-fix-fetext.diff
-	epatch "${FILESDIR}"/${PV}-dbus-0.60-support.patch
-
 	# use libdir/xchat/plugins as the plugin directory
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \