Version bump, fixes and unmask

9 files changed, 159 insertions, 8 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 14b1fc22d77b..de5ff30bb349 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2004/01/14 09:38:55 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.22 2004/01/14 10:38:41 aliz Exp $
+
+  14 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> sim-0.9.1.ebuild:
+  Make it work regardless of automake version installed. Also unmask.
+
+*sim-0.9.2 (14 Nov 2003)
+
+  14 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> sim-0.9.2.ebuild:
+  Version bump. Closing #36845.
 
   14 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> sim-0.9.ebuild, sim-0.9.1.ebuild :
   Mask 0.9.1 becuse of masked dependencies and unmask 0.9, closing #38145.
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 56e158bf1248..5ddc7e733c69 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,9 +1,15 @@
 MD5 00a6e8d046b30d8f9d43b282aa29ddfc sim-0.8.3.ebuild 1261
-MD5 ff5fc870e1d3809ac0983df08ee57e3e sim-0.9.1.ebuild 1390
+MD5 c380e031e39373e6756785d5cdd67ff5 sim-0.9.1.ebuild 1353
 MD5 3da0377d070c12dd8c5503433b8fca5c sim-0.9.ebuild 1380
-MD5 920bada76969e78cf6413190def2cdbc ChangeLog 3313
+MD5 717e9a00d1bcc8a2d77695b4ebc3cd6a sim-0.9.2.ebuild 1374
+MD5 1abaaccdc877ff071672cbf77eb5d096 ChangeLog 3575
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 4c1d988282342c2a0b08daf2e8823333 files/sim-0.9.2-configure.in.patch 631
 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 26d0710594e0e74ccdb6f42d4b3f45bc files/digest-sim-0.9.1 62
+MD5 f0e8d9224cd8b8261eae178335f8c791 files/digest-sim-0.9.2 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.2 b/net-im/sim/files/digest-sim-0.9.2
new file mode 100644
index 000000000000..3ece1620c858
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.2
@@ -0,0 +1 @@
+MD5 39e1bd670faa7b37c495cfbeb3a7c7d0 sim-0.9.2.tar.gz 3145950
diff --git a/net-im/sim/files/sim-0.9.1-configure.in.patch b/net-im/sim/files/sim-0.9.1-configure.in.patch
new file mode 100644
index 000000000000..9599ac3872fc
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.1-configure.in.patch
@@ -0,0 +1,11 @@
+--- configure.in	2003-11-09 11:23:11.000000000 +0000
++++ configure.in	2004-01-14 10:25:22.496984960 +0000
+@@ -232,7 +232,7 @@
+ AM_CONDITIONAL(plugins_splash_SUBDIR_included, test "x$plugins_splash_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(plugins_transparent_SUBDIR_included, test "x$plugins_transparent_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(plugins_update_SUBDIR_included, test "x$plugins_update_SUBDIR_included" = xyes)
+-AC_CONFIG_FILES([ ./Makefile ])
++AC_CONFIG_FILES([ Makefile ])
+ AC_CONFIG_FILES([ plugins/__homedir/Makefile ])
+ AC_CONFIG_FILES([ plugins/__migrate/Makefile ])
+ AC_CONFIG_FILES([ plugins/_core/Makefile ])
diff --git a/net-im/sim/files/sim-0.9.1-head.patch b/net-im/sim/files/sim-0.9.1-head.patch
new file mode 100644
index 000000000000..e875bab8536d
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.1-head.patch
@@ -0,0 +1,24 @@
+diff -u /tmp/sim-0.9.1/acinclude.m4 ./acinclude.m4
+--- acinclude.m4	2003-11-09 11:21:12.000000000 +0000
++++ acinclude.m4	2004-01-14 10:26:13.979614455 +0000
+@@ -9625,7 +9625,7 @@
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is.
+       # If DATA tags from a recent dlltool are present, honour them!
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname-def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname-def;
+diff -u /tmp/sim-0.9.1/aclocal.m4 ./aclocal.m4
+--- aclocal.m4	2003-11-09 11:23:25.000000000 +0000
++++ aclocal.m4	2004-01-14 10:26:06.646386026 +0000
+@@ -9582,7 +9582,7 @@
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is.
+       # If DATA tags from a recent dlltool are present, honour them!
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname-def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname-def;
diff --git a/net-im/sim/files/sim-0.9.2-configure.in.patch b/net-im/sim/files/sim-0.9.2-configure.in.patch
new file mode 100644
index 000000000000..80b2994f095e
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.2-configure.in.patch
@@ -0,0 +1,11 @@
+--- configure.in	2003-12-24 19:10:59.000000000 +0000
++++ configure.in	2004-01-14 10:09:56.155803265 +0000
+@@ -266,7 +266,7 @@
+ AM_CONDITIONAL(plugins_transparent_SUBDIR_included, test "x$plugins_transparent_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(plugins_update_SUBDIR_included, test "x$plugins_update_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(plugins_zodiak_SUBDIR_included, test "x$plugins_zodiak_SUBDIR_included" = xyes)
+-AC_CONFIG_FILES([ ./Makefile ])
++AC_CONFIG_FILES([ Makefile ])
+ AC_CONFIG_FILES([ plugins/__homedir/Makefile ])
+ AC_CONFIG_FILES([ plugins/__migrate/Makefile ])
+ AC_CONFIG_FILES([ plugins/_core/Makefile ])
diff --git a/net-im/sim/files/sim-0.9.2-head.patch b/net-im/sim/files/sim-0.9.2-head.patch
new file mode 100644
index 000000000000..f1310d3e8997
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.2-head.patch
@@ -0,0 +1,22 @@
+--- acinclude.m4	2003-12-24 19:10:45.000000000 +0000
++++ acinclude.m4	2004-01-14 10:07:52.744060428 +0000
+@@ -9626,7 +9626,7 @@
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is.
+       # If DATA tags from a recent dlltool are present, honour them!
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname-def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname-def;
+--- aclocal.m4	2003-12-24 19:11:05.000000000 +0000
++++ aclocal.m4	2004-01-14 10:08:01.427418736 +0000
+@@ -9583,7 +9583,7 @@
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is.
+       # If DATA tags from a recent dlltool are present, honour them!
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname-def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname-def;
diff --git a/net-im/sim/sim-0.9.1.ebuild b/net-im/sim/sim-0.9.1.ebuild
index c377e89eaec8..af94e9c4e754 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.5 2004/01/14 09:38:55 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.1.ebuild,v 1.6 2004/01/14 10:38:41 aliz Exp $
 
 if [ $( use kde ) ]; then
 	inherit kde-base eutils
@@ -15,19 +15,21 @@ DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contact
 SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
 RESTRICT="nomirror"
 HOMEPAGE="http://sim-icq.sourceforge.net"
-KEYWORDS="~x86 ~ppc -amd64"
+KEYWORDS="x86 ~ppc -amd64"
 SLOT="0"
 IUSE="ssl kde"
 
 newdepend "ssl? ( dev-libs/openssl )"
 DEPEND="$DEPEND
 	sys-devel/flex
-	>=sys-devel/automake-1.7.8"
+	sys-devel/automake"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	sed -i "s:head -\([0-9]\):head -n \1:g" acinclude.m4 aclocal.m4 configure
-	sed -i "s:\.\/Makefile:Makefile:g" configure
+
+	epatch ${FILESDIR}/${P}-head.patch
+	epatch ${FILESDIR}/${P}-configure.in.patch
+
 	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.in
 }
 
@@ -47,6 +49,8 @@ src_compile() {
 
 	WANT_AUTOMAKE=1.7
 
+	autoconf
+
 	use kde && kde_src_compile myconf
 
 	econf $myconf --without-gkrellm || die
diff --git a/net-im/sim/sim-0.9.2.ebuild b/net-im/sim/sim-0.9.2.ebuild
new file mode 100644
index 000000000000..c0823389bca1
--- /dev/null
+++ b/net-im/sim/sim-0.9.2.ebuild
@@ -0,0 +1,64 @@
+# 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.1 2004/01/14 10:38:41 aliz Exp $
+
+if [ $( use kde ) ]; then
+	inherit kde-base eutils
+	need-kde 3
+else
+	inherit base kde-functions eutils
+	need-qt 3
+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"
+RESTRICT="nomirror"
+HOMEPAGE="http://sim-icq.sourceforge.net"
+KEYWORDS="~x86 ~ppc -amd64"
+SLOT="0"
+IUSE="ssl kde"
+
+newdepend "ssl? ( dev-libs/openssl )"
+DEPEND="$DEPEND
+	sys-devel/flex
+	sys-devel/automake
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-head.patch
+	epatch ${FILESDIR}/${P}-configure.in.patch
+
+	sed -i 's:rm -rf $(sim_plugindir)/.*::g' plugins/*/Makefile.in
+}
+
+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
+
+	WANT_AUTOMAKE=1.7
+
+	autoconf
+
+	use kde && kde_src_compile myconf
+
+	econf $myconf --without-gkrellm || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc TODO README ChangeLog COPYING AUTHORS
+}