Add patch to fix compile failure, bug 173306, and drop mips keyword, bug 174060

(Portage version: 2.1.2.3)

8 files changed, 25 insertions, 12 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 25db27ec1d99..a610648ad72e 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.235 2007/04/02 15:39:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.236 2007/04/10 17:43:04 armin76 Exp $
+
+  10 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/2.8.2-fe-text-vartype.patch, xchat-2.6.6.ebuild,
+  xchat-2.8.0.ebuild, xchat-2.8.2.ebuild:
+  Add patch to fix compile failure, bug 173306, and drop mips keyword, bug 174060
 
   02 Apr 2007; Raúl Porcel <armin76@gentoo.org> xchat-2.8.2.ebuild:
   Remove patches for 2.8.0 in 2.8.2, bug 173147
diff --git a/net-irc/xchat/files/2.8.2-fe-text-vartype.patch b/net-irc/xchat/files/2.8.2-fe-text-vartype.patch
new file mode 100644
index 000000000000..a650f3926db1
--- /dev/null
+++ b/net-irc/xchat/files/2.8.2-fe-text-vartype.patch
@@ -0,0 +1,10 @@
+--- src/fe-text/fe-text.c.orig	2007-04-10 19:00:26.000000000 +0200
++++ src/fe-text/fe-text.c	2007-04-10 19:00:42.000000000 +0200
+@@ -856,6 +856,6 @@
+ }
+ void fe_tray_set_flash (const char *filename1, const char *filename2, int timeout){}
+ void fe_tray_set_file (const char *filename){}
+-void fe_tray_set_icon (int icon){}
++void fe_tray_set_icon (feicon icon){}
+ void fe_tray_set_tooltip (const char *text){}
+ void fe_tray_set_balloon (const char *title, const char *text){}
diff --git a/net-irc/xchat/files/digest-xchat-2.6.6 b/net-irc/xchat/files/digest-xchat-2.6.6
index 48ad87596305..8fc1b1ccabbf 100644
--- a/net-irc/xchat/files/digest-xchat-2.6.6
+++ b/net-irc/xchat/files/digest-xchat-2.6.6
@@ -1,6 +1,4 @@
-MD5 43c187582beb31e744c4c5a833a022b5 xchat-2.6.6.tar.bz2 1098934
 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 xchat-2.6.6.tar.bz2 1098934
 SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c xchat-2.6.6.tar.bz2 1098934
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.8.0 b/net-irc/xchat/files/digest-xchat-2.8.0
index dfa385249197..bfc16e48ad23 100644
--- a/net-irc/xchat/files/digest-xchat-2.8.0
+++ b/net-irc/xchat/files/digest-xchat-2.8.0
@@ -1,6 +1,5 @@
 MD5 dddb703d1daf9be7a7bc9461cf11ede7 xchat-2.8.0.tar.bz2 1257232
 RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 xchat-2.8.0.tar.bz2 1257232
 SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906 xchat-2.8.0.tar.bz2 1257232
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.8.2 b/net-irc/xchat/files/digest-xchat-2.8.2
index 78769b5d086e..bfe138dc8b2d 100644
--- a/net-irc/xchat/files/digest-xchat-2.8.2
+++ b/net-irc/xchat/files/digest-xchat-2.8.2
@@ -1,6 +1,5 @@
 MD5 d87a93bcd39d96ff3a3d0f8199efcf12 xchat-2.8.2.tar.bz2 1331148
 RMD160 62f9ffeb77243e1c20d81f0543ea8ccc7d3cd225 xchat-2.8.2.tar.bz2 1331148
 SHA256 9f6c22e7116afea4c00d90346b0522069f1c2197e8d0ad2f1545da01329750fe xchat-2.8.2.tar.bz2 1331148
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/xchat-2.6.6.ebuild b/net-irc/xchat/xchat-2.6.6.ebuild
index 9127f92dc070..f2b712dad978 100644
--- a/net-irc/xchat/xchat-2.6.6.ebuild
+++ b/net-irc/xchat/xchat-2.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.6.ebuild,v 1.12 2006/11/10 06:45:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.6.ebuild,v 1.13 2007/04/10 17:43:04 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0
diff --git a/net-irc/xchat/xchat-2.8.0.ebuild b/net-irc/xchat/xchat-2.8.0.ebuild
index 8551d1f391c7..bf60aa99e890 100644
--- a/net-irc/xchat/xchat-2.8.0.ebuild
+++ b/net-irc/xchat/xchat-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.12 2007/03/27 19:16:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.0.ebuild,v 1.13 2007/04/10 17:43:04 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0
diff --git a/net-irc/xchat/xchat-2.8.2.ebuild b/net-irc/xchat/xchat-2.8.2.ebuild
index 1abc8f09c979..fbc86b6e1563 100644
--- a/net-irc/xchat/xchat-2.8.2.ebuild
+++ b/net-irc/xchat/xchat-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.2.ebuild,v 1.2 2007/04/02 15:39:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.2.ebuild,v 1.3 2007/04/10 17:43:04 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0
@@ -41,6 +41,8 @@ src_unpack() {
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
 			"${S}"/configure{,.in} || die
 	fi
+
+#	epatch "${FILESDIR}"/${PV}-fe-text-vartype.patch
 }
 
 src_compile() {