Misc fixes

5 files changed, 25 insertions, 22 deletions

diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index fc6665a4e56f..b6b0e2251043 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,11 +1,10 @@
 MD5 00a6e8d046b30d8f9d43b282aa29ddfc sim-0.8.3.ebuild 1261
-MD5 c38b74f2c75e39c44ce9d10720770609 sim-0.9.1.ebuild 1470
+MD5 d6559b75f9eb440d7f01d778ccb4178b sim-0.9.1.ebuild 1467
 MD5 3da0377d070c12dd8c5503433b8fca5c sim-0.9.ebuild 1380
-MD5 16b1109c446c93b35db4fa13a2ad8e9d sim-0.9.2.ebuild 1509
-MD5 b8f1f132cf7c6dfade87d853e08c549a ChangeLog 4009
+MD5 f515af6e3fd39d3a4af9bf5f56dfc588 sim-0.9.2.ebuild 1507
+MD5 dc88ae6b44deb60ea496475fe61e830e ChangeLog 4009
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 4c1d988282342c2a0b08daf2e8823333 files/sim-0.9.2-configure.in.patch 631
-MD5 950f1fb396e48eb60f8e24626923bc8d files/sim-cvs-admin.tar.bz2 168739
 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
diff --git a/net-im/sim/files/digest-sim-0.9.1 b/net-im/sim/files/digest-sim-0.9.1
index 804842acdb20..7df4bd69fa79 100644
--- a/net-im/sim/files/digest-sim-0.9.1
+++ b/net-im/sim/files/digest-sim-0.9.1
@@ -1 +1,2 @@
 MD5 e43dd850e41731cd95fbc9fc6a923511 sim-0.9.1.tar.bz2 1735374
+MD5 950f1fb396e48eb60f8e24626923bc8d sim-cvs-admin.tar.bz2 168739
diff --git a/net-im/sim/files/digest-sim-0.9.2 b/net-im/sim/files/digest-sim-0.9.2
index 60752051a8b5..9d3bf1075237 100644
--- a/net-im/sim/files/digest-sim-0.9.2
+++ b/net-im/sim/files/digest-sim-0.9.2
@@ -1 +1,2 @@
 MD5 977db89295f52c4d7742e5f643b66f64 sim-0.9.2.tar.gz 3101316
+MD5 950f1fb396e48eb60f8e24626923bc8d sim-cvs-admin.tar.bz2 168739
diff --git a/net-im/sim/sim-0.9.1.ebuild b/net-im/sim/sim-0.9.1.ebuild
index 942b2d653d99..5749e098f74b 100644
--- a/net-im/sim/sim-0.9.1.ebuild
+++ b/net-im/sim/sim-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.7 2004/01/14 22:38:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.1.ebuild,v 1.8 2004/01/19 17:06:19 aliz Exp $
 
 if [ $( use kde ) ]; then
 	inherit kde-base eutils
@@ -12,7 +12,8 @@ fi
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
-SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.bz2
+	mirror://gentoo/sim-cvs-admin.tar.bz2 http://gentoo.tamperd.net/sim-cvs-admin.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://sim-icq.sourceforge.net"
 KEYWORDS="x86 ~ppc -amd64"
@@ -25,12 +26,11 @@ DEPEND="$DEPEND
 	sys-devel/automake"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${P}.tar.bz2 ; cd ${S}
+	rm -rf admin/
+	unpack sim-cvs-admin.tar.bz2
 
-	epatch ${FILESDIR}/${P}-head.patch
-	epatch ${FILESDIR}/${P}-configure.in.patch
-
-	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.in
+	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.am
 }
 
 src_compile() {
@@ -47,9 +47,10 @@ src_compile() {
 		need-qt 3
 	fi
 
-	WANT_AUTOMAKE=1.7
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
 
-	autoconf
+	make -f admin/Makefile.common
 
 	use kde && kde_src_compile myconf
 
diff --git a/net-im/sim/sim-0.9.2.ebuild b/net-im/sim/sim-0.9.2.ebuild
index 1e77e921dd0e..39e7d53de0bd 100644
--- a/net-im/sim/sim-0.9.2.ebuild
+++ b/net-im/sim/sim-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2004/01/15 13:23:49 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.2.ebuild,v 1.3 2004/01/19 17:06:19 aliz Exp $
 
 if [ $( use kde ) ]; then
 	inherit kde-base eutils
@@ -12,7 +12,8 @@ fi
 
 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}.tar.gz
+	mirror://gentoo/sim-cvs-admin.tar.bz2 http://gentoo.tamperd.net/sim-cvs-admin.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://sim-icq.sourceforge.net"
 KEYWORDS="~x86 ~ppc -amd64"
@@ -27,12 +28,11 @@ DEPEND="$DEPEND
 	app-text/sablotron"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${P}.tar.bz2 ; cd ${S}
+	rm -rf admin/
+	unpack sim-cvs-admin.tar.bz2
 
-	epatch ${FILESDIR}/${P}-head.patch
-	epatch ${FILESDIR}/${P}-configure.in.patch
-
-	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.in
+	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.am
 }
 
 src_compile() {
@@ -49,9 +49,10 @@ src_compile() {
 		need-qt 3
 	fi
 
-	WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
 
-	autoconf
+	make -f admin/Makefile.common
 
 	use kde && kde_src_compile myconf