Updating to -r2 to solve bug 42335

5 files changed, 61 insertions, 4 deletions

diff --git a/net-im/jit/ChangeLog b/net-im/jit/ChangeLog
index bc7c4ababd89..67360eb0ed38 100644
--- a/net-im/jit/ChangeLog
+++ b/net-im/jit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jit
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.3 2004/02/17 21:36:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.4 2004/02/26 01:23:53 humpback Exp $
+
+*jit-1.1.6-r2 (26 Feb 2004)
+
+  26 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r2.ebuild,
+  files/jit-patch-00:
+  Adding -r2 with a patch to help build with gcc 3. See bug 42335. Thanks to
+  Alan <alan@ufies.org>
 
   17 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r1.ebuild:
   Marking stable on x86
diff --git a/net-im/jit/Manifest b/net-im/jit/Manifest
index 8cd4f836c298..a5b2cd22a2c6 100644
--- a/net-im/jit/Manifest
+++ b/net-im/jit/Manifest
@@ -1,8 +1,11 @@
+MD5 1336bafb5de205a03108dfd701da6e21 jit-1.1.6-r2.ebuild 1039
 MD5 492ca41aaaa6f45ca67c1ce998a58fb9 jit-1.1.6-r1.ebuild 1005
 MD5 7790f4556753d2a09382cb1123d3253c metadata.xml 403
 MD5 8417de7ecd0233c3f3a1daeb9852f949 ChangeLog 654
 MD5 7035b679b45c1be037bb51a4a652f0d9 jit-1.1.6.ebuild 886
 MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r1 61
+MD5 50412e85cf54ff2a36e6b51564731c82 files/jit-patch-00 1271
+MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r2 61
 MD5 1b9cebaa84401871db0325d28a7cd51a files/jit.xml 3943
 MD5 54f7c7c05a3bf14a77d8a9e592079c18 files/README.Gentoo 1479
 MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6 61
diff --git a/net-im/jit/files/digest-jit-1.1.6 b/net-im/jit/files/digest-jit-1.1.6-r2
index 6ce790b0931e..6ce790b0931e 100644
--- a/net-im/jit/files/digest-jit-1.1.6
+++ b/net-im/jit/files/digest-jit-1.1.6-r2
diff --git a/net-im/jit/files/jit-patch-00 b/net-im/jit/files/jit-patch-00
new file mode 100644
index 000000000000..9efc205b161e
--- /dev/null
+++ b/net-im/jit/files/jit-patch-00
@@ -0,0 +1,34 @@
+Only in jit-1.1.6/jabberd: .mio_xml.c.swp
+diff -ru jit-1.1.6.orig/jabberd/mio_xml.c jit-1.1.6/jabberd/mio_xml.c
+--- jit-1.1.6.orig/jabberd/mio_xml.c	2004-02-21 00:35:57.206273528 -0800
++++ jit-1.1.6/jabberd/mio_xml.c	2004-02-21 00:33:17.000000000 -0800
+@@ -142,14 +142,7 @@
+         nul += 4;
+         bufsz = bufsz - (nul - buf);
+         buf = nul;
+-        mio_write(m,NULL,"HTTP/1.0 200 Ok
+-Server: jabber/xmlstream-hack-0.1
+-Expires: Fri, 10 Oct 1997 10:10:10 GMT
+-Pragma: no-cache
+-Cache-control: private
+-Connection: close
+-
+-",-1);
++        mio_write(m,NULL,"HTTP/1.0 200 Ok\nServer: jabber/xmlstream-hack-0.1\nExpires: Fri, 10 Oct 1997 10:10:10 GMT\nPragma: no-cache\nCache-control: private\nConnection: close\n",-1);
+         m->type = type_NORMAL;
+     }
+ 
+Only in jit-1.1.6/jit/jit: .wp_client.cpp.swp
+diff -ru jit-1.1.6.orig/jit/jit/wp_client.cpp jit-1.1.6/jit/jit/wp_client.cpp
+--- jit-1.1.6.orig/jit/jit/wp_client.cpp	2004-02-21 00:36:00.867716904 -0800
++++ jit-1.1.6/jit/jit/wp_client.cpp	2004-02-21 00:31:05.000000000 -0800
+@@ -146,7 +146,8 @@
+ }
+ 
+ void WPclient::SignalDisconnected(DisconnectedEvent *ev) {
+-  terror e = (terror){0,""};
++  terror e;
++  e = (terror){0,""};
+   
+   switch(ev->getReason()){
+   case DisconnectedEvent::FAILED_BADUSERNAME:
diff --git a/net-im/jit/jit-1.1.6.ebuild b/net-im/jit/jit-1.1.6-r2.ebuild
index 8057c85400a0..d481d2d95787 100644
--- a/net-im/jit/jit-1.1.6.ebuild
+++ b/net-im/jit/jit-1.1.6-r2.ebuild
@@ -1,19 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6.ebuild,v 1.1 2004/01/12 01:00:49 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r2.ebuild,v 1.1 2004/02/26 01:23:53 humpback Exp $
 
 DESCRIPTION="ICQ transport for WPjabber/Jabberd"
 HOMEPAGE="http://jit.jabberstudio.org/"
 SRC_URI="http://www.jabberstudio.org/files/jit/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
 SLOT="0"
 
-#DEPEND=">=net-im/jabberd-1.4.2"
+IUSE=""
+
+KEYWORDS="~x86"
+
+DEPEND=""
+RDEPEND=">=net-im/jabberd-1.4.3"
 
 
 src_compile() {
+	epatch ${FILESDIR}/jit-patch-00
 	./configure
 	emake || die
 	cp ${S}/jabberd/jabberd ${S}/jabberd/jit-wpjabber
@@ -32,3 +37,11 @@ src_install() {
 	fperms u+xs /usr/sbin/jit-wpjabber
 	dodoc ${FILESDIR}/README.Gentoo
 }
+
+pkg_postinst() {
+
+	einfo
+	einfo "Please read /usr/share/doc/${P}/README.Gentoo.gz"
+	einfo
+
+}