Closing #43129 and #46928.

5 files changed, 20 insertions, 33 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 64aa1f652014..0dd9b9a8bf58 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.33 2004/04/13 12:40:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.34 2004/04/13 14:43:39 aliz Exp $
+
+*sim-0.9.3-r2 (13 Apr 2004)
+
+  13 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> sim-0.9.3-r2.ebuild:
+  * Rewrote some parts of the ebuild, treat it as a non-kde ebuild, closing #43129.
+  * Added libxslt to DEPEND, closing #46928.
 
   13 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> sim-0.9.1.ebuild,
   sim-0.9.2.ebuild:
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 4106fc823374..5a552cfd2865 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,19 +1,19 @@
+MD5 bb0eb636ea8fe8e68370b871a18af9d9 sim-0.9.3-r2.ebuild 983
 MD5 00a6e8d046b30d8f9d43b282aa29ddfc sim-0.8.3.ebuild 1261
 MD5 0384ed187d6a982dcc4eec9c5b6e8927 sim-0.9.1.ebuild 1504
 MD5 3da0377d070c12dd8c5503433b8fca5c sim-0.9.ebuild 1380
-MD5 f738ee8fa92271f246a5de67a8f9fda6 sim-0.9.3.ebuild 1287
 MD5 fd87bb4615f1d0e2e38812b863d9b523 sim-0.9.3-r1.ebuild 1292
 MD5 e37926006a65ccc75e668323dba5cbf5 sim-0.9.2.ebuild 1541
-MD5 935b097fe101c4c785bf7e5bb6429cda ChangeLog 4671
+MD5 b9dee9da30a01ab2f31a475fae7b1cc2 ChangeLog 4899
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 4c1d988282342c2a0b08daf2e8823333 files/sim-0.9.2-configure.in.patch 631
 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 a94792947bc42773b2787e7efefe3148 files/digest-sim-0.9 60
 MD5 d339c32dde1b02b447f028c1c4a351f0 files/sim-0.9.1-head.patch 1318
 MD5 ee5f989cba64648aa222ad7061f5e03c files/digest-sim-0.8.3 62
 MD5 abe10c96757808b5f793bce54e91076c files/digest-sim-0.9.1 129
 MD5 c133708c32a698c1115ab3e7e7973b28 files/digest-sim-0.9.2 128
-MD5 a466df81c42a5dd5eeecbec313af4300 files/digest-sim-0.9.3 62
 MD5 cb3390f262933321cba597b3b650e2a0 files/sim-0.9.2-head.patch 1220
 MD5 b4b10f2dfda34070eb8630e9ff5f2b27 files/sim-0.9.1-configure.in.patch 631
diff --git a/net-im/sim/files/digest-sim-0.9.3 b/net-im/sim/files/digest-sim-0.9.3
deleted file mode 100644
index 1928d5c8db93..000000000000
--- a/net-im/sim/files/digest-sim-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c277579df074c31c5dc09a876bde50f4 sim-0.9.3.tar.gz 3729191
diff --git a/net-im/sim/files/digest-sim-0.9.3-r2 b/net-im/sim/files/digest-sim-0.9.3-r2
new file mode 100644
index 000000000000..d42385a97df3
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.3-r2
@@ -0,0 +1 @@
+MD5 b16e462076540acc13da81832ae79d00 sim-0.9.3-2.tar.gz 3728770
diff --git a/net-im/sim/sim-0.9.3.ebuild b/net-im/sim/sim-0.9.3-r2.ebuild
index b5146bc58d46..eebb4fa31aa8 100644
--- a/net-im/sim/sim-0.9.3.ebuild
+++ b/net-im/sim/sim-0.9.3-r2.ebuild
@@ -1,18 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3.ebuild,v 1.1 2004/04/01 07:36:05 aliz Exp $
-
-if [ $( use kde ) ]; then
-	inherit kde-base eutils
-	need-kde 3
-else
-	inherit base kde-functions eutils
-	need-qt 3
-fi
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r2.ebuild,v 1.1 2004/04/13 14:43:39 aliz Exp $
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
-SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sim-icq/${P}-2.tar.gz"
 RESTRICT="nomirror"
 HOMEPAGE="http://sim-icq.sourceforge.net"
 KEYWORDS="~x86 ~ppc -amd64"
@@ -20,34 +12,23 @@ SLOT="0"
 IUSE="ssl kde"
 
 RDEPEND="ssl? ( dev-libs/openssl )
-	app-text/sablotron"
-DEPEND="$RDEPEND
+	kde? ( kde-base/kde ) : ( x11-libs/qt )
+	app-text/sablotron
 	sys-devel/flex
 	sys-devel/automake
-	>=sys-devel/autoconf-2.58"
+	sys-devel/autoconf
+	>=sys-devel/autoconf-2.58
+	dev-libs/libxslt"
 
 src_compile() {
-	local myconf
-
-	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
-	else
-		need-qt 3
-	fi
-
 	export WANT_AUTOCONF=2.5
 	export WANT_AUTOMAKE=1.7
 
 	make -f admin/Makefile.common
 
-	use kde && kde_src_compile myconf
+	econf `use_enable ssl openssl` \
+		`use_enable kde`
 
-	econf $myconf --without-gkrellm || die
 	make clean  || die
 	emake || die
 }