Revision to close bug 66835. Made some gcc34 fixes and a patch for history bug. This package is stinky and unstable and needs help upstream.

7 files changed, 302 insertions, 11 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 7f934f497882..15b07fd4bfb1 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.41 2004/06/28 21:47:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.42 2004/10/19 12:23:45 absinthe Exp $
+
+*sim-0.9.3-r3 (19 Oct 2004)
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/sim-0.9.3-alt-histpreview-apply-fix.diff,
+  +files/sim-0.9.3-gcc34.diff, sim-0.9.3-r2.ebuild, +sim-0.9.3-r3.ebuild:
+  Revision to close bug 66835. Made some gcc34 fixes and a patch for history
+  bug. This package is stinky and unstable and needs help upstream.
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> sim-0.8.3.ebuild,
   sim-0.9.2.ebuild, sim-0.9.3-r1.ebuild:
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 7e99e9d32dc8..62249d82e7cc 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,15 +1,19 @@
-MD5 40a715abd3fddec7eddf80d8bbf4f3dd sim-0.9.3-r2.ebuild 1057
+MD5 a2bfb2fc4fe8fe8bbb31eb3229eb5d68 ChangeLog 5957
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 675f837559431c951fb0a27199682612 sim-0.8.3.ebuild 1256
-MD5 b4e880db1b4fc25d6c712dbace6c23d7 sim-0.9.3-r1.ebuild 1269
 MD5 f24f8e61ede86a4b3aef6cc053c60cfa sim-0.9.2.ebuild 1537
-MD5 2a2507f268d7192b595d10ae6f08eaf7 ChangeLog 5606
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 4c1d988282342c2a0b08daf2e8823333 files/sim-0.9.2-configure.in.patch 631
+MD5 b4e880db1b4fc25d6c712dbace6c23d7 sim-0.9.3-r1.ebuild 1269
+MD5 73818a36a189c3448c1e1a149bdafc68 sim-0.9.3-r2.ebuild 1057
+MD5 b1080ad3a86ad08a260e0a575649239f sim-0.9.3-r3.ebuild 1166
+MD5 ee5f989cba64648aa222ad7061f5e03c files/digest-sim-0.8.3 62
+MD5 c133708c32a698c1115ab3e7e7973b28 files/digest-sim-0.9.2 128
 MD5 4c14c29d500e9d851cd3796159ef370b files/digest-sim-0.9.3-r1 64
 MD5 4c14c29d500e9d851cd3796159ef370b files/digest-sim-0.9.3-r2 64
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.3-nostl.diff 863
+MD5 b4b10f2dfda34070eb8630e9ff5f2b27 files/sim-0.9.1-configure.in.patch 631
 MD5 d339c32dde1b02b447f028c1c4a351f0 files/sim-0.9.1-head.patch 1318
-MD5 ee5f989cba64648aa222ad7061f5e03c files/digest-sim-0.8.3 62
-MD5 c133708c32a698c1115ab3e7e7973b28 files/digest-sim-0.9.2 128
+MD5 4c1d988282342c2a0b08daf2e8823333 files/sim-0.9.2-configure.in.patch 631
 MD5 cb3390f262933321cba597b3b650e2a0 files/sim-0.9.2-head.patch 1220
-MD5 b4b10f2dfda34070eb8630e9ff5f2b27 files/sim-0.9.1-configure.in.patch 631
+MD5 899d5f26e1fdd2cdf7ba7f3b254c6827 files/sim-0.9.3-gcc34.diff 6216
+MD5 4c14c29d500e9d851cd3796159ef370b files/digest-sim-0.9.3-r3 64
+MD5 d445cf2393c585b9f264237be7e9ccdd files/sim-0.9.3-alt-histpreview-apply-fix.diff 498
diff --git a/net-im/sim/files/digest-sim-0.9.3-r3 b/net-im/sim/files/digest-sim-0.9.3-r3
new file mode 100644
index 000000000000..d42385a97df3
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.3-r3
@@ -0,0 +1 @@
+MD5 b16e462076540acc13da81832ae79d00 sim-0.9.3-2.tar.gz 3728770
diff --git a/net-im/sim/files/sim-0.9.3-alt-histpreview-apply-fix.diff b/net-im/sim/files/sim-0.9.3-alt-histpreview-apply-fix.diff
new file mode 100644
index 000000000000..66fbbbfc8448
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.3-alt-histpreview-apply-fix.diff
@@ -0,0 +1,12 @@
+--- sim/plugins/_core/historycfg.cpp.orig	2004-06-16 07:56:23 +0600
++++ sim/plugins/_core/historycfg.cpp	2004-08-07 12:29:01 +0600
+@@ -313,8 +313,8 @@
+     if (bChanged){
+         Event e(EventHistoryConfig);
+         e.process();
+-        fillPreview();
+     }
++    fillPreview();
+     HistoryUserData *data = (HistoryUserData*)(getContacts()->getUserData(CorePlugin::m_plugin->history_data_id));
+     data->CutDays.bValue = chkDays->isChecked();
+     data->CutSize.bValue = chkSize->isChecked();
diff --git a/net-im/sim/files/sim-0.9.3-gcc34.diff b/net-im/sim/files/sim-0.9.3-gcc34.diff
new file mode 100644
index 000000000000..83a9e01196e1
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.3-gcc34.diff
@@ -0,0 +1,220 @@
+diff -ur sim-0.9.3/plugins/_core/cfgdlg.cpp sim-0.9.3-new/plugins/_core/cfgdlg.cpp
+--- sim-0.9.3/plugins/_core/cfgdlg.cpp	2004-03-07 07:39:54.000000000 -0500
++++ sim-0.9.3-new/plugins/_core/cfgdlg.cpp	2004-10-19 07:37:55.510344496 -0400
+@@ -279,7 +279,7 @@
+     return new MainInfo(dlg, NULL);
+ }
+ 
+-};
++}
+ 
+ using namespace ConfigDlg;
+ 
+diff -ur sim-0.9.3/plugins/_core/statuswnd.cpp sim-0.9.3-new/plugins/_core/statuswnd.cpp
+--- sim-0.9.3/plugins/_core/statuswnd.cpp	2004-03-07 07:39:54.000000000 -0500
++++ sim-0.9.3-new/plugins/_core/statuswnd.cpp	2004-10-19 07:43:39.849996912 -0400
+@@ -115,7 +115,7 @@
+     QToolTip::add(this, tip);
+     resize(pict.width(), pict.height());
+     setFixedSize(pict.width(), pict.height());
+-};
++}
+ 
+ void StatusLabel::timeout()
+ {
+diff -ur sim-0.9.3/plugins/yahoo/yahooauth.cpp sim-0.9.3-new/plugins/yahoo/yahooauth.cpp
+--- sim-0.9.3/plugins/yahoo/yahooauth.cpp	2004-03-15 01:23:14.000000000 -0500
++++ sim-0.9.3-new/plugins/yahoo/yahooauth.cpp	2004-10-19 07:59:28.671754080 -0400
+@@ -52,7 +52,7 @@
+ {
+     char *yahoo_crypt(const char *key, const char *salt);
+     int yahoo_Dispatch(int Salt, int Parameter);
+-};
++}
+ 
+ /* This is the y64 alphabet... it's like base64, but has a . and a _ */
+ char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._";
+diff -ur sim-0.9.3/sim/api/cfg.cpp sim-0.9.3-new/sim/api/cfg.cpp
+--- sim-0.9.3/sim/api/cfg.cpp	2004-03-16 11:15:30.000000000 -0500
++++ sim-0.9.3-new/sim/api/cfg.cpp	2004-10-19 07:01:52.271206832 -0400
+@@ -1092,4 +1092,4 @@
+     return strcmp(s1, s2) != 0;
+ }
+ 
+-};
++}
+diff -ur sim-0.9.3/sim/api/cmddef.cpp sim-0.9.3-new/sim/api/cmddef.cpp
+--- sim-0.9.3/sim/api/cmddef.cpp	2003-11-10 04:11:10.000000000 -0500
++++ sim-0.9.3-new/sim/api/cmddef.cpp	2004-10-19 07:07:25.390564992 -0400
+@@ -424,6 +424,6 @@
+     return res;
+ }
+ 
+-};
++}
+ 
+ 
+diff -ur sim-0.9.3/sim/api/contacts.cpp sim-0.9.3-new/sim/api/contacts.cpp
+--- sim-0.9.3/sim/api/contacts.cpp	2004-03-19 03:13:29.000000000 -0500
++++ sim-0.9.3-new/sim/api/contacts.cpp	2004-10-19 07:10:24.409350000 -0400
+@@ -1952,7 +1952,7 @@
+     return PluginManager::contacts;
+ }
+ 
+-};
++}
+ 
+ EXPORT QString g_i18n(const char *text, Contact *contact)
+ {
+diff -ur sim-0.9.3/sim/api/country.cpp sim-0.9.3-new/sim/api/country.cpp
+--- sim-0.9.3/sim/api/country.cpp	2003-10-17 01:22:07.000000000 -0400
++++ sim-0.9.3-new/sim/api/country.cpp	2004-10-19 07:10:37.223401968 -0400
+@@ -539,4 +539,4 @@
+ }
+ 
+ 
+-};
++}
+diff -ur sim-0.9.3/sim/api/html.h sim-0.9.3-new/sim/api/html.h
+--- sim-0.9.3/sim/api/html.h	2004-03-07 07:40:03.000000000 -0500
++++ sim-0.9.3-new/sim/api/html.h	2004-10-19 07:18:30.311481648 -0400
+@@ -46,6 +46,6 @@
+     friend class HTMLParserPrivate;
+ };
+ 
+-};
++}
+ 
+ #endif
+diff -ur sim-0.9.3/sim/api/html.ll sim-0.9.3-new/sim/api/html.ll
+--- sim-0.9.3/sim/api/html.ll	2004-03-01 15:10:25.000000000 -0500
++++ sim-0.9.3-new/sim/api/html.ll	2004-10-19 07:28:33.555774576 -0400
+@@ -347,7 +347,7 @@
+ 	return res;
+ }
+ 
+-};
++}
+ 
+ int yywrap() { return 1; }
+ 
+diff -ur sim-0.9.3/sim/api/log.cpp sim-0.9.3-new/sim/api/log.cpp
+--- sim-0.9.3/sim/api/log.cpp	2003-10-20 04:39:28.000000000 -0400
++++ sim-0.9.3-new/sim/api/log.cpp	2004-10-19 07:10:48.285720240 -0400
+@@ -143,4 +143,4 @@
+     return m;
+ }
+ 
+-};
++}
+diff -ur sim-0.9.3/sim/api/message.cpp sim-0.9.3-new/sim/api/message.cpp
+--- sim-0.9.3/sim/api/message.cpp	2004-03-28 13:46:15.000000000 -0500
++++ sim-0.9.3-new/sim/api/message.cpp	2004-10-19 07:16:24.524604160 -0400
+@@ -645,5 +645,5 @@
+     return "";
+ }
+ 
+-};
++}
+ 
+diff -ur sim-0.9.3/sim/api/plugins.cpp sim-0.9.3-new/sim/api/plugins.cpp
+--- sim-0.9.3/sim/api/plugins.cpp	2004-03-28 13:46:15.000000000 -0500
++++ sim-0.9.3-new/sim/api/plugins.cpp	2004-10-19 07:12:47.001672672 -0400
+@@ -792,4 +792,4 @@
+ ContactList *PluginManager::contacts = NULL;
+ SocketFactory *PluginManager::factory = NULL;
+ 
+-};
++}
+diff -ur sim-0.9.3/sim/api/simapi.cpp sim-0.9.3-new/sim/api/simapi.cpp
+--- sim-0.9.3/sim/api/simapi.cpp	2004-03-28 13:46:15.000000000 -0500
++++ sim-0.9.3-new/sim/api/simapi.cpp	2004-10-19 07:12:59.862717496 -0400
+@@ -963,7 +963,7 @@
+     return strcmp(m_str->c_str(), a.m_str->c_str()) < 0;
+ }
+ 
+-};
++}
+ 
+ #ifndef HAVE_STRCASECMP
+ 
+diff -ur sim-0.9.3/sim/api/simapi.h sim-0.9.3-new/sim/api/simapi.h
+--- sim-0.9.3/sim/api/simapi.h	2004-03-29 18:42:44.000000000 -0500
++++ sim-0.9.3-new/sim/api/simapi.h	2004-10-19 07:01:14.708917168 -0400
+@@ -1803,7 +1803,7 @@
+ EXPORT bool logEnabled();
+ EXPORT void setLogEnable(bool);
+ 
+-};
++}
+ 
+ using namespace SIM;
+ 
+diff -ur sim-0.9.3/sim/api/socket.cpp sim-0.9.3-new/sim/api/socket.cpp
+--- sim-0.9.3/sim/api/socket.cpp	2004-03-26 12:46:43.000000000 -0500
++++ sim-0.9.3-new/sim/api/socket.cpp	2004-10-19 07:21:42.464269984 -0400
+@@ -464,7 +464,7 @@
+ 
+ #endif
+ 
+-};
++}
+ 
+ #ifndef WIN32
+ #include "socket.moc"
+diff -ur sim-0.9.3/sim/api/socket.h sim-0.9.3-new/sim/api/socket.h
+--- sim-0.9.3/sim/api/socket.h	2004-03-28 23:46:04.000000000 -0500
++++ sim-0.9.3-new/sim/api/socket.h	2004-10-19 07:01:33.721026888 -0400
+@@ -256,6 +256,6 @@
+ 
+ #endif
+ 
+-};
++}
+ 
+ #endif
+diff -ur sim-0.9.3/sim/api/sockfactory.cpp sim-0.9.3-new/sim/api/sockfactory.cpp
+--- sim-0.9.3/sim/api/sockfactory.cpp	2004-03-22 15:03:14.000000000 -0500
++++ sim-0.9.3-new/sim/api/sockfactory.cpp	2004-10-19 07:22:03.948003960 -0400
+@@ -640,7 +640,7 @@
+ #endif
+ }
+ 
+-};
++}
+ 
+ #ifndef WIN32
+ #include "sockfactory.moc"
+diff -ur sim-0.9.3/sim/api/sockfactory.h sim-0.9.3-new/sim/api/sockfactory.h
+--- sim-0.9.3/sim/api/sockfactory.h	2004-02-29 19:40:49.000000000 -0500
++++ sim-0.9.3-new/sim/api/sockfactory.h	2004-10-19 07:07:12.945456936 -0400
+@@ -152,7 +152,7 @@
+     QDns *resolver;
+ };
+ 
+-};
++}
+ 
+ #endif
+ 
+diff -ur sim-0.9.3/sim/api/translit.cpp sim-0.9.3-new/sim/api/translit.cpp
+--- sim-0.9.3/sim/api/translit.cpp	2003-10-20 04:39:29.000000000 -0400
++++ sim-0.9.3-new/sim/api/translit.cpp	2004-10-19 07:18:45.357194352 -0400
+@@ -75,4 +75,4 @@
+     return res;
+ }
+ 
+-};
++}
+diff -ur sim-0.9.3/sim/sim.cpp sim-0.9.3-new/sim/sim.cpp
+--- sim-0.9.3/sim/sim.cpp	2004-03-16 11:15:29.000000000 -0500
++++ sim-0.9.3-new/sim/sim.cpp	2004-10-19 07:33:38.960346024 -0400
+@@ -287,7 +287,7 @@
+     CloseHandle(hMutex);
+ #endif
+     return res;
+-};
++}
+ 
+ 
+ 
diff --git a/net-im/sim/sim-0.9.3-r2.ebuild b/net-im/sim/sim-0.9.3-r2.ebuild
index 2ef0e128a08e..03b1ad71e506 100644
--- a/net-im/sim/sim-0.9.3-r2.ebuild
+++ b/net-im/sim/sim-0.9.3-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r2.ebuild,v 1.7 2004/06/24 23:00:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r2.ebuild,v 1.8 2004/10/19 12:23:45 absinthe Exp $
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
 SRC_URI="mirror://sourceforge/sim-icq/${P}-2.tar.gz"
 RESTRICT="nomirror"
 HOMEPAGE="http://sim-icq.sourceforge.net"
-KEYWORDS="x86 ~ppc -amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 SLOT="0"
 IUSE="ssl kde debug"
 
diff --git a/net-im/sim/sim-0.9.3-r3.ebuild b/net-im/sim/sim-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..7743985abc1e
--- /dev/null
+++ b/net-im/sim/sim-0.9.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r3.ebuild,v 1.1 2004/10/19 12:23:45 absinthe Exp $
+
+inherit eutils
+
+LICENSE="GPL-2"
+DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
+SRC_URI="mirror://sourceforge/sim-icq/${P}-2.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://sim-icq.sourceforge.net"
+KEYWORDS="~x86 ~ppc ~amd64"
+SLOT="0"
+IUSE="ssl kde debug"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	kde? ( kde-base/kdebase )
+	!kde? ( x11-libs/qt )
+	app-text/sablotron
+	sys-devel/flex
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5
+	dev-libs/libxslt"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-gcc34.diff
+	epatch ${FILESDIR}/${P}-alt-histpreview-apply-fix.diff
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+
+	addwrite "${QTDIR}/etc/settings"
+
+	make -f admin/Makefile.common
+
+	econf `use_enable ssl openssl` \
+		`use_enable kde` \
+		`use_enable debug` || die "econf failed"
+
+	make clean  || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc TODO README ChangeLog COPYING AUTHORS
+}