Revision bump, fixes #67390.

5 files changed, 297 insertions, 11 deletions

diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index 72451c26c1b1..3bd84cc7e161 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/silc-plugin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.7 2004/10/12 19:42:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.8 2004/10/17 19:11:23 ticho Exp $
+
+*silc-plugin-1.0.1-r1 (17 Oct 2004)
+
+  17 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  +silc-plugin-1.0.1-r1.ebuild, +files/1.0.1-branch-update.patch:
+  Removing MAKEOPTS for silc-client's lib compilation, as parallel build (-jX)
+  breaks it. Thanks to viq <viq@go2.pl> for reporting this, and to Jochen
+  Eisinger <jochen@penguin-breeder.org> for finding the solution. Closes
+  #67390.
 
   12 Oct 2004; Andrej Kacian <ticho@gentoo.org> +files/1.0.1-gcc34.patch,
   silc-plugin-1.0.1.ebuild:
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index af4653968fac..7c2069256cfe 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -1,15 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f6d26cfbae99200b2df227d077fa41be silc-plugin-1.0.1.ebuild 2965
 MD5 e1e0712204dc60aad98100bcb96378ec ChangeLog 1096
 MD5 3d21d1bc81cfd81bfd0b0b3b2123b71c metadata.xml 271
+MD5 69e28bf97eabeea2423ec8d2140b053a silc-plugin-1.0.1-r1.ebuild 2965
+MD5 55c5513559f61c05b673445428d33d12 files/digest-silc-plugin-20041016 206
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1 202
 MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBbDOW10xuJSrg3/sRAtVbAJ0RVxWx+RCg9DPYJQ82HaMlU3xsnwCfZ8ee
-4LeRD7+6cRswvS4c0x9NZS0=
-=iJYN
------END PGP SIGNATURE-----
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r1 202
+MD5 71989b1101d6cf41e9f61a1b62d2cc85 files/1.0.1-branch-update.patch 6717
+MD5 7eabff0defee367a08feb0fa3f4c43ce files/1.0.1-hmac-fix.patch 1227
diff --git a/net-im/silc-plugin/files/1.0.1-branch-update.patch b/net-im/silc-plugin/files/1.0.1-branch-update.patch
new file mode 100644
index 000000000000..67b9d6fdcc58
--- /dev/null
+++ b/net-im/silc-plugin/files/1.0.1-branch-update.patch
@@ -0,0 +1,181 @@
+diff -Naur silc-plugin-1.0.1/README silc-plugin/README
+--- silc-plugin-1.0.1/README	2004-01-15 17:29:07.000000000 +0100
++++ silc-plugin/README	2004-09-01 09:32:16.000000000 +0200
+@@ -5,31 +5,64 @@
+  o http://irssi.org/files/irssi-0.8.9.tar.gz
+  o http://silcnet.org/download/client/sources/silc-client-1.0.1.tar.gz
+ 
++I assume you already downloaded the silc-plugin source tarball:
++
++ o http://penguin-breeder.org/silc/download/silc-plugin-1.0.1.tar.gz
++
++PLEASE NOTE:
++
++ I will use the following terms from here on:
++
++  - SILC Plugin directory ($PLUGIN_DIR)
++    This is wherever you have unpacked the silc-plugin-1.0.1.tar.gz
++  - SILC Client directory ($CLIENT_DIR)
++    This is wherever you have unpacked the silc-client-1.0.1.tar.gz
++  - Irssi directory       ($IRSSI_DIR)
++    This is wherever you have unpack the irssi-0.8.9.tar.gz
++
++First you need to untar all three tarballs:
++
++   tar xzf irssi-0.8.9.tar.gz
++   export IRSSI_DIR=`pwd`/irssi-0.8.9
++   tar xzf silc-client-1.0.1.tar.gz
++   export CLIENT_DIR=`pwd`/silc-client-1.0.1
++   tar xzf silc-plugin-1.0.1.tar.gz
++   export PLUGIN_DIR=`pwd`/silc-plugin-1.0.1
++
+ Next, you need to configure and compile the SILC Client 1.0.1.
+ You should give at least the following options to configure (assuming
+ Irssi is installed with prefix /usr):
+ 
++   cd $CLIENT_DIR
+    ./configure  --prefix=/usr \
+                 --with-helpdir=/usr/share/irssi/help/silc \
+ 		--without-libtoolfix \
++		--enable-static \
+                 --enable-debug
+-   make
++   make -C lib
++
++On some systems libraries have to be "position independent executables",
++you should give option --with-pic to SILC Client's configure script
++on such systems. If you encounter problems with pthread, give option
++--with-pthreads=no to SILC Client's configure script.
+ 
+ During installation, only the help files from the SILC Client's source tree 
+ will be installed. You may specify other options needed to compile the SILC 
+ Client to fit your needs.
+ 
+ After successfully compiling the SILC Client 1.0.1, unpack the Irssi 0.8.9
+-source package and give the following command (assuming you unpacked Irssi
+-into /tmp/irssi-0.8.9 and the compiled SILC Client package is in 
+-/tmp/silc-client-1.0.1):
++source package and give the following command from within the SILC Plugin
++directory (assuming you unpacked Irssi into /tmp/irssi-0.8.9 and the compiled
++SILC Client package is in /tmp/silc-client-1.0.1):
+ 
++   cd $PLUGIN_DIR
+    make patch IRSSI=/tmp/irssi-0.8.9 SILC=/tmp/silc-client-1.0.1
+ 
+-This will prepare the Irssi source package to compile the SILC Plugin. Change
++This will prepare the Irssi source package for compiling the SILC Plugin. Change
+ into the Irssi source directory, configure and compile it. Assuming again
+ Irssi is installed in /usr:
+ 
++   cd $IRSSI_DIR
+    ./configure --prefix=/usr --sysconfdir=/etc
+    make -C src/perl
+    make -C src/fe-common/silc
+@@ -40,26 +73,28 @@
+ To install the SILC Plugin, you have to give the following commands in
+ Irssi's source directory:
+ 
++   cd $IRSSI_DIR
+    make -C src/perl/silc install
+    make -C src/fe-common/silc install
+    make -C src/silc/core install
+ 
+-and the following commands in SILC Client's source directory:
++and the following command in the SILC Client's source directory:
+ 
+-   make -C irssi/docs/help
++   cd $CLIENT_DIR
++   make -C irssi/docs/help install
+ 
+-This installs the following:
++You will now have installed:
+    
+-   /usr/lib/irssi/modules/libfe_silc.{so,la,a}
+-   /usr/lib/irssi/modules/libsilc_core.{so,la,a}
++   /usr/lib/irssi/modules/libfe_silc.*
++   /usr/lib/irssi/modules/libsilc_core.*
+    /usr/share/irssi/help/silc/*
+    /usr/lib/perl/*/Irssi/Silc.pm
+    /usr/lib/perl/*/auto/Irssi/Silc.so
+ 
+-If you don't have perl, just ommit the commands related to perl. Where the
+-perl modules will be installed depends on your local settings.
++If you don't have perl, just ommit the commands related to perl. The location
++where the perl modules will be installed depends on your local setup.
+ 
+-You should also add the files in the scripts/ (of the SILC Plugin) directory to 
++You should also add the files in the scripts/ directory (of the SILC Plugin) to 
+ 
+    /usr/share/irssi/scripts/
+ 
+diff -Naur silc-plugin-1.0.1/patches/silcnet_create-fix.patch silc-plugin/patches/silcnet_create-fix.patch
+--- silc-plugin-1.0.1/patches/silcnet_create-fix.patch	1970-01-01 01:00:00.000000000 +0100
++++ silc-plugin/patches/silcnet_create-fix.patch	2004-03-19 18:34:55.000000000 +0100
+@@ -0,0 +1,55 @@
++--- irssi/src/silc/core/silc-chatnets.c.orig	2004-03-19 11:12:19.000000000 +0100
+++++ irssi/src/silc/core/silc-chatnets.c	2004-03-19 11:12:50.000000000 +0100
++@@ -26,14 +26,6 @@
++ 
++ #include "silc-chatnets.h"
++ 
++-void silcnet_create(SILC_CHATNET_REC *rec)
++-{
++-	g_return_if_fail(rec != NULL);
++-
++-	rec->chat_type = SILC_PROTOCOL;
++-        chatnet_create((CHATNET_REC *) rec);
++-}
++-
++ static void sig_chatnet_read(SILC_CHATNET_REC *rec, CONFIG_NODE *node)
++ {
++ 	if (!IS_SILC_CHATNET(rec))
++--- irssi/src/silc/core/silc-chatnets.h.orig	2004-03-19 11:12:24.000000000 +0100
+++++ irssi/src/silc/core/silc-chatnets.h	2004-03-19 11:12:35.000000000 +0100
++@@ -20,8 +20,6 @@
++ 
++ typedef struct _SILC_CHATNET_REC SILC_CHATNET_REC;
++ 
++-void silcnet_create(SILC_CHATNET_REC *rec);
++-
++ #define silc_chatnet_find(name) \
++ 	SILC_CHATNET(chatnet_find(name))
++ #define silcnet_find(name) silc_chatnet_find(name)
++--- irssi/src/fe-common/silc/fe-silcnet.c.orig	2004-03-19 11:13:13.000000000 +0100
+++++ irssi/src/fe-common/silc/fe-silcnet.c	2004-03-19 11:13:40.000000000 +0100
++@@ -31,6 +31,14 @@
++ #include "silc-chatnets.h"
++ #include "printtext.h"
++ 
+++void silcnet_create(SILC_CHATNET_REC *rec)
+++{
+++	g_return_if_fail(rec != NULL);
+++
+++	rec->chat_type = SILC_PROTOCOL;
+++        chatnet_create((CHATNET_REC *) rec);
+++}
+++
++ static void cmd_silcnet_list(void)
++ {
++ 	GString *str;
++--- irssi/src/fe-common/silc/module.h.orig	2004-03-19 18:34:19.000000000 +0100
+++++ irssi/src/fe-common/silc/module.h	2004-03-19 18:34:27.000000000 +0100
++@@ -1,6 +1,7 @@
++ #include "common.h"
++ 
++ #define MODULE_NAME "fe-common/silc"
+++#define SILC_PROTOCOL (chat_protocol_lookup("SILC"))
++ 
++ #undef PACKAGE
++ #undef VERSION
+diff -Naur silc-plugin-1.0.1/scripts/silc-mime.pl silc-plugin/scripts/silc-mime.pl
+--- silc-plugin-1.0.1/scripts/silc-mime.pl	2004-01-14 20:40:04.000000000 +0100
++++ silc-plugin/scripts/silc-mime.pl	2004-04-24 19:58:40.000000000 +0200
+@@ -63,7 +63,7 @@
+         Irssi::printformat(MSGLEVEL_CRAP, 'no_temp_dir',
+             Irssi::settings_get_str("mime_temp_dir"));
+ 
+-        Irssi:settings_set_str("mime_temp_dir", "/tmp");
++        Irssi::settings_set_str("mime_temp_dir", "/tmp");
+ 
+     }
+ }
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r1 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r1
new file mode 100644
index 000000000000..4d53c13b01ee
--- /dev/null
+++ b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 6610ee0e27922f447e40828cf7dee507 irssi-0.8.9.tar.bz2 816465
+MD5 6e086ddb21dc18e706750f43412f6b93 silc-client-1.0.1.tar.gz 1862493
+MD5 986c750f2dac66838e3db505341923df silc-plugin-1.0.1.tar.gz 24789
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..66912fd4db38
--- /dev/null
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild,v 1.1 2004/10/17 19:11:23 ticho Exp $
+
+inherit eutils
+
+IRSSI_PV=0.8.9
+
+DESCRIPTION="A SILC plugin for Irssi"
+HOMEPAGE="http://penguin-breeder.org/silc/"
+SRC_URI="http://irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
+	http://silcnet.org/download/client/sources/silc-client-${PV}.tar.gz
+	http://penguin-breeder.org/silc/download/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE="debug pic"
+
+# All necessary dependencies are pulled in by irssi.
+DEPEND="virtual/libc"
+RDEPEND="~net-irc/irssi-0.8.9"
+
+S_SILC="${S}/../silc-client-${PV}"
+S_IRSSI="${S}/../irssi-${IRSSI_PV}"
+
+src_compile() {
+
+	echo
+	einfo "Preparing silc-client\n"
+	cd ${S_SILC}
+	econf --with-helpdir=${D}/usr/share/irssi/help/silc/ \
+		--without-libtoolfix \
+		--enable-static \
+		`use_with pic` \
+		`use_enable debug` || die "silc-client configure failed"
+	( MAKEOPTS="" emake -C lib ) || die "silc-client's lib compilation failed"
+
+	echo
+	einfo "Patching irssi source for silc-plugin\n"
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-branch-update.patch || die "${PV}-branch-update.patch failed"
+	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
+
+	cd ${S_IRSSI}
+
+	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
+	epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
+
+	echo
+	einfo "Configuring irssi\n"
+	econf --sysconfdir=/etc || die "irssi configure failed"
+	echo
+	einfo "Compiling silc-plugin\n"
+	emake -C src/perl || die "irssi's src/perl compilation failed"
+	emake -C src/fe-common/silc || die "irssi's src/fe-common/silc compilation failed"
+	emake -C src/silc/core || die "irssi's src/silc/core compilation failed"
+}
+
+src_install() {
+	cd ${S_IRSSI}
+	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
+	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
+	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
+
+	cd ${S_SILC}
+	make -C irssi/docs/help install || die "silc-client's helpfiles installation failed"
+
+	cd ${S}
+	insinto /usr/share/irssi/scripts
+	doins scripts/*
+
+	insinto /usr/share/irssi
+	doins default.theme
+
+	dodoc AUTHORS COPYING README USAGE
+}
+
+pkg_postinst() {
+	einfo "You can load the plugin with following command in Irssi:"
+	einfo
+	einfo "\t/LOAD silc"
+	einfo
+	einfo "It will automatically generate a new key pair for you. You will be asked to"
+	einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
+	einfo "empty, your key will not be stored encrypted."
+	einfo
+	einfo "You should also load the perl scripts:"
+	einfo
+	einfo "\t/SCRIPT LOAD silc"
+	einfo "\t/SCRIPT LOAD silc-mime"
+	einfo
+	einfo "To connect to the SILCNet, you can use following command in Irssi:"
+	einfo
+	einfo "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
+	einfo
+	einfo "Have fun."
+}