hopefully fix #9385, #9567

3 files changed, 55 insertions, 4 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 506b63b86391..7b44f0f002fa 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/sim
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.3 2002/10/25 16:20:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.4 2002/12/05 19:19:00 danarmak Exp $
+
+  05 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Add patch to fix compilation problems. Hopefully close bugs #9385 and #9567.
 
 *sim-0.8 (25 Oct 2002)
 
diff --git a/net-im/sim/files/sim-0.8-nostl.diff b/net-im/sim/files/sim-0.8-nostl.diff
new file mode 100644
index 000000000000..c778186bacb7
--- /dev/null
+++ b/net-im/sim/files/sim-0.8-nostl.diff
@@ -0,0 +1,36 @@
+diff -urN sim-0.8.orig/sim/msgedit.cpp sim-0.8/sim/msgedit.cpp
+--- sim/msgedit.cpp	2002-10-20 03:06:15.000000000 +0200
++++ sim/msgedit.cpp	2002-12-05 19:34:23.000000000 +0200
+@@ -15,6 +15,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#define QT_NO_STL
++
+ #include "msgedit.h"
+ #include "msgview.h"
+ #include "editspell.h"
+diff -urN sim-0.8.orig/sim/parse.ll sim-0.8/sim/parse.ll
+--- sim/parse.ll	2002-10-20 01:20:35.000000000 +0200
++++ sim/parse.ll	2002-12-05 19:34:08.000000000 +0200
+@@ -16,6 +16,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#define QT_NO_STL
++
+ #include "mainwin.h"
+ #include "client.h"
+ #include <stack>
+diff -urN sim-0.8.orig/sim/passwddlg.cpp sim-0.8/sim/passwddlg.cpp
+--- sim/passwddlg.cpp	2002-10-10 10:21:14.000000000 +0200
++++ sim/passwddlg.cpp	2002-12-05 19:33:59.000000000 +0200
+@@ -15,6 +15,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#define QT_NO_STL
++
+ #include "passwddlg.h"
+ #include "client.h"
+ #include "mainwin.h"
diff --git a/net-im/sim/sim-0.8.ebuild b/net-im/sim/sim-0.8.ebuild
index cfb4c604bca9..651fd93beea2 100644
--- a/net-im/sim/sim-0.8.ebuild
+++ b/net-im/sim/sim-0.8.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.ebuild,v 1.1 2002/10/25 16:20:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.ebuild,v 1.2 2002/12/05 19:19:00 danarmak Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base
-[ -n "`use kde`" ] || inherit kde-functions
+[ -n "`use kde`" ] || inherit base kde-functions
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
 SRC_URI="http://sim.shutoff.spb.ru/${P}.tar.gz"
 HOMEPAGE="http://sim.shutoff.spb.ru/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 
 newdepend "ssl? ( dev-libs/openssl )"
+DEPEND="$DEPEND sys-devel/flex"
 
 if [ -n "`use ssl`" ]; then
     myconf="$myconf --enable-openssl"
@@ -29,6 +30,8 @@ else
     myconf="$myconf --disable-kde"
 fi
 
+PATCHES="$FILESDIR/$P-nostl.diff"
+
 src_compile() {
 
     [ -n "`use kde`" ] && kde_src_compile myconf
@@ -39,3 +42,11 @@ src_compile() {
     emake || die
 
 }
+
+src_install() {
+
+    cd $S
+    make DESTDIR=$D install
+    dodoc TODO README ChangeLog COPYING AUTHORS
+
+}