bugfixes, delete old versions and unmask

10 files changed, 18 insertions, 302 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 039eae4b9073..76a974c42fb0 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.13 2003/09/17 21:27:45 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.14 2003/10/27 14:50:03 aliz Exp $
+
+  27 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> sim-0.8.3.ebuild :
+  Various cleanups and fixes. Closing #30637. Cleanded out old ebuilds.
 
   17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> sim-0.8.3.ebuild :
   Fixed dependencies and made econf a little pretties. Closing #23797.
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index af68dda2dc19..927b5ef6e962 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,19 +1,7 @@
-MD5 3f4ccf62fe6f3e98736d6d591f801522 ChangeLog 2365
-MD5 0ace8650f366c7c63f305efa81cf577d sim-0.6.ebuild 705
-MD5 003defc6b16e88f4fbe91fc15787413c sim-0.7.ebuild 952
-MD5 2137c77593a8928734d0e2f3ce92d8ba sim-0.8.1.ebuild 1127
-MD5 dda5a646edf49b2e43100f5d52176056 sim-0.8.ebuild 1121
-MD5 ed35ac8c5b198a7d5a063c589552ae1e sim-0.8.2.ebuild 1256
+MD5 d2c58cd16220dff748723250d4756b32 ChangeLog 2505
 MD5 d2591bab556bc46ee7bdab9f5b9063f6 sim-0.8.2-r2.ebuild 1356
-MD5 e601007cac122ceb0ada655877945230 sim-0.8.3.ebuild 1383
+MD5 ea6a625ca427b562e10e634b5f9a5c3d sim-0.8.3.ebuild 1235
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2 62
-MD5 b48c0b16be6c9e590da0440cc946e90d files/digest-sim-0.6 60
-MD5 224e22f4b01fda60c071163ea009d91d files/digest-sim-0.7 60
-MD5 5119360311ee2e0d4deb5980ee5d7cda files/digest-sim-0.8 60
-MD5 e39c7c8c9d2fe41315e3aeb07d586631 files/digest-sim-0.8.1 62
-MD5 aa747a199a1399a0948ece6df1836e44 files/sim-0.8-nostl.diff 1311
-MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.1-nostl.diff 863
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.2-nostl.diff 863
 MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2-r2 62
 MD5 ee5f989cba64648aa222ad7061f5e03c files/digest-sim-0.8.3 62
diff --git a/net-im/sim/files/sim-0.8-nostl.diff b/net-im/sim/files/sim-0.8-nostl.diff
deleted file mode 100644
index c778186bacb7..000000000000
--- a/net-im/sim/files/sim-0.8-nostl.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/sim-0.8.1-nostl.diff b/net-im/sim/files/sim-0.8.1-nostl.diff
deleted file mode 100644
index b7c714953ecd..000000000000
--- a/net-im/sim/files/sim-0.8.1-nostl.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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 --git a/net-im/sim/sim-0.6.ebuild b/net-im/sim/sim-0.6.ebuild
deleted file mode 100644
index 9d0416eaed37..000000000000
--- a/net-im/sim/sim-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.6.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
-inherit kde-base
-
-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"
-
-#if [ "`use kde`" ]; then
-#    need-qt 3
-#    myconf="$myconf --enable-kde"
-#else
-	need-kde 3
-#    myconf="$myconf --disable-kde"
-#fi
-#
-#src_compile() {
-#
-#    kde_src_compile myconf
-#    myconf="$myconf --prefix=/usr"
-#    kde_src_compile configure make
-#
-#}
diff --git a/net-im/sim/sim-0.7.ebuild b/net-im/sim/sim-0.7.ebuild
deleted file mode 100644
index df6ace1d9084..000000000000
--- a/net-im/sim/sim-0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.7.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
-
-IUSE="ssl kde"
-[ -n "`use kde`" ] && inherit kde-base
-[ -n "`use kde`" ] || inherit 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"
-SLOT="0"
-
-newdepend "ssl? ( dev-libs/openssl )"
-
-if [ -n "`use ssl`" ]; then
-	myconf="$myconf --enable-openssl"
-else
-	myconf="$myconf --disable-openssl"
-fi
-
-if [ -n "`use kde`" ]; then
-	need-kde 3
-	myconf="$myconf --enable-kde"
-else
-	need-qt 3
-	myconf="$myconf --disable-kde"
-fi
-
-src_compile() {
-	[ -n "`use kde`" ] && kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
-
-	cd $S
-	./configure $myconf || die
-	emake || die
-}
diff --git a/net-im/sim/sim-0.8.1.ebuild b/net-im/sim/sim-0.8.1.ebuild
deleted file mode 100644
index e02f76877f6c..000000000000
--- a/net-im/sim/sim-0.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 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.1.ebuild,v 1.4 2003/04/05 22:26:31 danarmak Exp $
-
-IUSE="ssl kde"
-[ -n "`use kde`" ] && inherit kde-base
-[ -n "`use kde`" ] || inherit base kde-functions
-
-LICENSE="GPL-2"
-DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
-SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
-HOMEPAGE="http://sim-icq.sourceforge.net"
-KEYWORDS="x86 ~ppc"
-SLOT="0"
-
-newdepend "ssl? ( dev-libs/openssl )"
-DEPEND="$DEPEND sys-devel/flex"
-
-if [ -n "`use ssl`" ]; then
-	myconf="$myconf --enable-openssl"
-else
-	myconf="$myconf --disable-openssl"
-fi
-
-if [ -n "`use kde`" ]; then
-	need-kde 3
-	myconf="$myconf --enable-kde"
-else
-	need-qt 3
-	myconf="$myconf --disable-kde"
-fi
-
-PATCHES="${FILESDIR}/${P}-nostl.diff"
-
-src_compile() {
-	[ -n "`use kde`" ] && kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
-
-	econf $myconf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc TODO README ChangeLog COPYING AUTHORS
-}
diff --git a/net-im/sim/sim-0.8.2.ebuild b/net-im/sim/sim-0.8.2.ebuild
deleted file mode 100644
index 32fdcbcd956c..000000000000
--- a/net-im/sim/sim-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 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.2.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
-
-IUSE="ssl kde"
-[ -n "`use kde`" ] && inherit kde-base
-[ -n "`use kde`" ] || inherit base kde-functions
-
-LICENSE="GPL-2"
-DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
-SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
-HOMEPAGE="http://sim-icq.sourceforge.net"
-KEYWORDS="x86 ~ppc"
-SLOT="0"
-
-newdepend "ssl? ( dev-libs/openssl )"
-DEPEND="$DEPEND sys-devel/flex"
-
-if [ -n "`use ssl`" ]; then
-	myconf="$myconf --enable-openssl"
-else
-	myconf="$myconf --disable-openssl"
-fi
-
-if [ -n "`use kde`" ]; then
-	need-kde 3
-	myconf="$myconf --enable-kde"
-else
-	need-qt 3
-	myconf="$myconf --disable-kde"
-fi
-
-need-automake 1.5
-need-autoconf 2.5
-
-PATCHES="${FILESDIR}/${P}-nostl.diff"
-
-src_compile() {
-	make -f admin/Makefile.common
-
-	myconf="$myconf --without-gkrellm_plugin"
-	[ -n "`use kde`" ] && kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
-
-	econf $myconf --without-gkrellm || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc TODO README ChangeLog COPYING AUTHORS
-}
diff --git a/net-im/sim/sim-0.8.3.ebuild b/net-im/sim/sim-0.8.3.ebuild
index 1efae5162421..9b57a296197c 100644
--- a/net-im/sim/sim-0.8.3.ebuild
+++ b/net-im/sim/sim-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.3.ebuild,v 1.5 2003/10/10 08:50:03 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.3.ebuild,v 1.6 2003/10/27 14:50:03 aliz Exp $
 
 if [ $( use kde ) ]; then
 	inherit kde-base eutils
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
 SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
 HOMEPAGE="http://sim-icq.sourceforge.net"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 IUSE="ssl kde"
 
@@ -28,30 +28,27 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ -n "`use ssl`" ]; then
-		myconf="$myconf --enable-openssl"
-	else
-		myconf="$myconf --disable-openssl"
-	fi
+	local myconf
 
-	if [ -n "`use kde`" ]; then
+	myconf="$( use_enable ssl openssl )"
+	myconf="$myconf $( use_enable kde )"
+	myconf="$myconf --without-gkrellm_plugin"
+	myconf="$myconf --prefix=/usr"
+
+	if [ $( use kde ) ]; then
 		need-kde 3
-		myconf="$myconf --enable-kde"
 	else
 		need-qt 3
-		myconf="$myconf --disable-kde"
 	fi
 
-	need-automake 1.5
+	need-automake 1.6
 	need-autoconf 2.5
 
 	make -f admin/Makefile.common
 
-	myconf="$myconf --without-gkrellm_plugin"
-	[ -n "`use kde`" ] && kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
+	use kde && kde_src_compile myconf
 
-	econf $myconf --without-gkrellm $( use-enable kde ) $( use-enable ssl openssl ) || die
+	econf $myconf --without-gkrellm || die
 	make || die
 }
 
diff --git a/net-im/sim/sim-0.8.ebuild b/net-im/sim/sim-0.8.ebuild
deleted file mode 100644
index 9287f37aefcf..000000000000
--- a/net-im/sim/sim-0.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 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.4 2003/09/05 23:58:58 msterret Exp $
-
-IUSE="ssl kde"
-[ -n "`use kde`" ] && inherit kde-base
-[ -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"
-SLOT="0"
-
-newdepend "ssl? ( dev-libs/openssl )"
-DEPEND="$DEPEND sys-devel/flex"
-
-if [ -n "`use ssl`" ]; then
-	myconf="$myconf --enable-openssl"
-else
-	myconf="$myconf --disable-openssl"
-fi
-
-if [ -n "`use kde`" ]; then
-	need-kde 3
-	myconf="$myconf --enable-kde"
-else
-	need-qt 3
-	myconf="$myconf --disable-kde"
-fi
-
-PATCHES="$FILESDIR/$P-nostl.diff"
-
-src_compile() {
-
-	[ -n "`use kde`" ] && kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
-
-	cd $S
-	./configure $myconf || die
-	emake || die
-}
-
-src_install() {
-	cd $S
-	make DESTDIR=$D install
-	dodoc TODO README ChangeLog COPYING AUTHORS
-}