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

Package-Manager: portage-2.1.2.3

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 25db27ec1d999595a9c6689382d1dbe2fccc38a9..a610648ad72e7f3c8e76e0003c0df04bb408b55d 100644 (file)
--- 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/Manifest b/net-irc/xchat/Manifest
index 7fe750635cfc92b807fc9e7a91829c66b71b0abe..47765e7558a08eb7fa3a45369b769eb4112adb23 100644 (file)
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,3 +1,7 @@
+AUX 2.8.2-fe-text-vartype.patch 474 RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 SHA1 3f8407f37316373412600f657ca6d047d961cde1 SHA256 40ee51d248682d18f9fd543863cb4c1a3b02affd4e620f631da9185605224da8
+MD5 7833847ce839c0aafb6623d7dc096528 files/2.8.2-fe-text-vartype.patch 474
+RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 files/2.8.2-fe-text-vartype.patch 474
+SHA256 40ee51d248682d18f9fd543863cb4c1a3b02affd4e620f631da9185605224da8 files/2.8.2-fe-text-vartype.patch 474
 AUX xc280-fix-back.diff 417 RMD160 4ad490abfb3a215509359b1e911557486ca29a98 SHA1 1f00cda52915f50799a987220078e2fcf1233b80 SHA256 00c05695b8e486adef4b1749e79f6f9e6e012f3682fc2f64aff0fe8b1600ebcb
 MD5 f41792f986d2b916630cb7de4bab0bfc files/xc280-fix-back.diff 417
 RMD160 4ad490abfb3a215509359b1e911557486ca29a98 files/xc280-fix-back.diff 417
@@ -14,32 +18,32 @@ DIST xchat-2.6.6.tar.bz2 1098934 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93
 DIST xchat-2.8.0.tar.bz2 1257232 RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 SHA1 80248b4fcd45261c686557eb243fec6ce459bd60 SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906
 DIST xchat-2.8.2.tar.bz2 1331148 RMD160 62f9ffeb77243e1c20d81f0543ea8ccc7d3cd225 SHA1 5cff7a974819ad8788962742df785aabfe844af0 SHA256 9f6c22e7116afea4c00d90346b0522069f1c2197e8d0ad2f1545da01329750fe
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
-EBUILD xchat-2.6.6.ebuild 2556 RMD160 d7f3629116551f23958d8681adc055835ff2ed01 SHA1 05be2bc9263bca1c6166882e7569267b7784c2ec SHA256 9bcdf2a67b3a531b369fb3893e2d2be9ba4affbe9f03c024129ca830757c8187
-MD5 1fdb7ba5e92d9b7ec7ce1465ca09a501 xchat-2.6.6.ebuild 2556
-RMD160 d7f3629116551f23958d8681adc055835ff2ed01 xchat-2.6.6.ebuild 2556
-SHA256 9bcdf2a67b3a531b369fb3893e2d2be9ba4affbe9f03c024129ca830757c8187 xchat-2.6.6.ebuild 2556
-EBUILD xchat-2.8.0.ebuild 2670 RMD160 055853be387ba2b0071649547d83abbd414354fc SHA1 bdf6d991616c71262bc46bd8b81e78dfc7b13b88 SHA256 6ba5de8cd187fb8b025db10f0d18fdb52fe1a6f396a90f41694a50737fac4f94
-MD5 c7b16e9d7af474a91056f051cb5ed7a1 xchat-2.8.0.ebuild 2670
-RMD160 055853be387ba2b0071649547d83abbd414354fc xchat-2.8.0.ebuild 2670
-SHA256 6ba5de8cd187fb8b025db10f0d18fdb52fe1a6f396a90f41694a50737fac4f94 xchat-2.8.0.ebuild 2670
-EBUILD xchat-2.8.2.ebuild 2593 RMD160 e461517c3f3a703501d1cfe09f432d75f3405948 SHA1 f6f997af5453712a11a1f8e1871e5f1955ddee60 SHA256 9cb9c80da24c13077d8a556f5b5eff827c3725757dc0904516db51303a01ca4d
-MD5 4494c71620d28c2c84aad296c445707d xchat-2.8.2.ebuild 2593
-RMD160 e461517c3f3a703501d1cfe09f432d75f3405948 xchat-2.8.2.ebuild 2593
-SHA256 9cb9c80da24c13077d8a556f5b5eff827c3725757dc0904516db51303a01ca4d xchat-2.8.2.ebuild 2593
-MISC ChangeLog 34773 RMD160 7cc29f850b2fcb637632b2f05fb7ad9103ee2b2d SHA1 c842ae370539415f975179e25bb113aa6ef8e8fc SHA256 3b25544b7ef85bcdf30c0615df5cf55697fb7413bb0ce1538a41362f66360708
-MD5 7144779e665296d658cc4980d116c43d ChangeLog 34773
-RMD160 7cc29f850b2fcb637632b2f05fb7ad9103ee2b2d ChangeLog 34773
-SHA256 3b25544b7ef85bcdf30c0615df5cf55697fb7413bb0ce1538a41362f66360708 ChangeLog 34773
+EBUILD xchat-2.6.6.ebuild 2552 RMD160 4bef252062df509ab8d66bb154fa12c1b085fc0c SHA1 6efbbf4d6d455a5c68ed85fa8a98b56570cc8e82 SHA256 07f53316344b6f77d8d16d53d5cdc7940576a4bff8a72150cc04f19671d781c1
+MD5 36cebbbfa31e4f7a798d380cfc77cea5 xchat-2.6.6.ebuild 2552
+RMD160 4bef252062df509ab8d66bb154fa12c1b085fc0c xchat-2.6.6.ebuild 2552
+SHA256 07f53316344b6f77d8d16d53d5cdc7940576a4bff8a72150cc04f19671d781c1 xchat-2.6.6.ebuild 2552
+EBUILD xchat-2.8.0.ebuild 2664 RMD160 77d876fe71dc436c8ac541b10bf55eae836b3994 SHA1 def3f1fa5c1e4893586d4b0cdb85d09b08d4720f SHA256 367a8ef760fd1c4ce286965565ec60edfe8f0acb431acf8ee1a9f1ab8912c6a6
+MD5 395fe6890c03bbc029a51823c695fb2b xchat-2.8.0.ebuild 2664
+RMD160 77d876fe71dc436c8ac541b10bf55eae836b3994 xchat-2.8.0.ebuild 2664
+SHA256 367a8ef760fd1c4ce286965565ec60edfe8f0acb431acf8ee1a9f1ab8912c6a6 xchat-2.8.0.ebuild 2664
+EBUILD xchat-2.8.2.ebuild 2639 RMD160 b93b4038ce2d60befe8d74ce114ce08f524a9252 SHA1 60d34958098c179d5960da70d7c705065fcaebd6 SHA256 25ed3e4853550b07179efe16f3d5dde947633489d642653da4f76471c156cdfa
+MD5 f5a06ba34b073b7455a011f55af1734c xchat-2.8.2.ebuild 2639
+RMD160 b93b4038ce2d60befe8d74ce114ce08f524a9252 xchat-2.8.2.ebuild 2639
+SHA256 25ed3e4853550b07179efe16f3d5dde947633489d642653da4f76471c156cdfa xchat-2.8.2.ebuild 2639
+MISC ChangeLog 35005 RMD160 dd05276ca00f22a2240c2aa23eb404b1870933ed SHA1 ab84d4188cedaee7f9df92c3a8b109e640e1ef0e SHA256 81c68a2c78272f6674404ebc4abca1f6b4c804028a1427a0abcb11279923258f
+MD5 27f60d931ab4f0cc32aca4d226224b87 ChangeLog 35005
+RMD160 dd05276ca00f22a2240c2aa23eb404b1870933ed ChangeLog 35005
+SHA256 81c68a2c78272f6674404ebc4abca1f6b4c804028a1427a0abcb11279923258f ChangeLog 35005
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 bf4d4c8da339dfef2c7d6e839f246d57 files/digest-xchat-2.6.6 506
-RMD160 3feacc9cc904f012def98eb0f4be0aa9e6a6b093 files/digest-xchat-2.6.6 506
-SHA256 cac69c943207ddbb7d0ac2a4ac89d72a1a684910bb1b80b6921880c022beb815 files/digest-xchat-2.6.6 506
-MD5 b3e2949a39f06e663eeef05700d5907e files/digest-xchat-2.8.0 506
-RMD160 ae3ec7e73f9b27754b76e4ee9a07ea10398bda4e files/digest-xchat-2.8.0 506
-SHA256 bdf80ad286d8c86f7ffe7e19a3576f52cd37a6c68d69f6b5e3c50dc8ab441820 files/digest-xchat-2.8.0 506
-MD5 2dcd641e0b156d21137fcdd48d46a327 files/digest-xchat-2.8.2 506
-RMD160 c309217ddeaf825ec8090024737f77be0ba2f92a files/digest-xchat-2.8.2 506
-SHA256 fd897d052710db36f1bd39e0a7125fe30778f86d0826509ee88d2742ec14dd7a files/digest-xchat-2.8.2 506
+MD5 10ba09e32d4d29a3681721ef33bd85f1 files/digest-xchat-2.6.6 368
+RMD160 03cd46952bc2a0b1e5945f491bf0cd2f7d003f57 files/digest-xchat-2.6.6 368
+SHA256 6a86715dfd84a3fc25386b3f07d09e0c6fc236e52b70896f67be2e321db2ae26 files/digest-xchat-2.6.6 368
+MD5 7305ba3f28f483b99b85bd38378b50b2 files/digest-xchat-2.8.0 433
+RMD160 f1988ea6b308aed1bd66d6afd1edf479cb144290 files/digest-xchat-2.8.0 433
+SHA256 e95175e719f9adcf81a2eb67a76f8e1e935a5a89c55df4ac65e1d14f96d298ef files/digest-xchat-2.8.0 433
+MD5 a1aaee75a6c7f58dd8a58e707a17067d files/digest-xchat-2.8.2 433
+RMD160 d6ad9156ac9f2afbf9832b97ac77773db9b65f44 files/digest-xchat-2.8.2 433
+SHA256 1fdc240bf06d802fd0b97299626477a83c4aed268d4ccaa8c8ae2ae78da4b7b3 files/digest-xchat-2.8.2 433

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 (file)
index 0000000..a650f39
--- /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 48ad87596305b730b5b95f8622aeb1c12f8faca2..8fc1b1ccabbf92fa18230f968e2fb388062c1dcc 100644 (file)
--- 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 dfa385249197a003d6534543251f98a854c980c5..bfc16e48ad2302b59d5bc91e7d62e49723147627 100644 (file)
--- 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 78769b5d086e7de0f9762b93ec1fb17a49080f4c..bfe138dc8b2d7733e2158e67f5ba7902f3110962 100644 (file)
--- 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 9127f92dc07085b5ed137d44c29632f6c3ee2938..f2b712dad97895ba9cbd4cfc5d6924984f2c343e 100644 (file)
--- 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 8551d1f391c7b1e9a996c16a6c6804227d6d61c8..bf60aa99e89016c6620d669cc8b70daa0b841d4e 100644 (file)
--- 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 1abc8f09c979c4bb2bd38b9aa3049efcf67bb999..fbc86b6e1563055fd36a365b7415b5fb5c13db28 100644 (file)
--- 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() {