Only change term_type to term_charset if installed irssi is >=0.8.10. Bug #104046 by Daniel Link <stagger at gmx.net>.

(Portage version: 2.0.51.22-r2)

4 files changed, 121 insertions, 11 deletions

diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index cb00fd61ee56..172ce3a08b22 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/silc-plugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.15 2005/08/21 22:23:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.16 2005/08/29 15:02:32 ticho Exp $
+
+*silc-plugin-1.0.1-r4 (29 Aug 2005)
+
+  29 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +silc-plugin-1.0.1-r4.ebuild:
+  Only change term_type to term_charset if installed irssi is >=0.8.10. Bug
+  #104046 by Daniel Link <stagger at gmx.net>.
 
   21 Aug 2005; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r3.ebuild:
   Depend on glib-1.2.
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index 5c94aacba9c0..4d2101fa3b0b 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 519516107c584f989f4808400037cab0 silc-plugin-1.0.1-r2.ebuild 3209
+MD5 84e0c7fff4bde4ccfb329860d194d0d2 silc-plugin-1.0.1-r4.ebuild 3431
 MD5 ee20a764d4ace9b102fc2ce743b88a0f silc-plugin-1.0.1-r1.ebuild 3164
 MD5 86c039cfdc524867233a99ade0f016e7 silc-plugin-1.0.1-r3.ebuild 3375
 MD5 344ebef9061c20b9ff61b473dea2e415 ChangeLog 2867
@@ -13,10 +11,4 @@ MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r1 202
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r2 202
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r3 202
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDCP7UQlM6RnzZP+IRAteMAKCLqM4S5YCPyLq3IIxDdXzz4SKolQCbBnI2
-QHKRz1GKSFrG0RkGRB+O+5E=
-=ylJv
------END PGP SIGNATURE-----
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r4 202
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r4 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r4
new file mode 100644
index 000000000000..4d53c13b01ee
--- /dev/null
+++ b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r4
@@ -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-r4.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
new file mode 100644
index 000000000000..21658546b677
--- /dev/null
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 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-r4.ebuild,v 1.1 2005/08/29 15:02:32 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 ~amd64"
+IUSE="debug"
+
+# All necessary dependencies are pulled in by irssi.
+DEPEND="virtual/libc
+	=dev-libs/glib-1.2*"
+RDEPEND=">=net-irc/irssi-${IRSSI_PV}
+	>=dev-perl/MIME-tools-5.413
+	dev-perl/File-MMagic
+	dev-perl/MailTools"
+
+S_SILC="${S}/../silc-client-${PV}"
+S_IRSSI="${S}/../irssi-${IRSSI_PV}"
+
+src_compile() {
+
+	echo
+	einfo "Preparing silc-client\n"
+	cd ${S_SILC}
+	if has_version ">=net-irc/irssi-0.8.10" ; then
+		sed -i -e "s:\"term_type\":\"term_charset\":" \
+			irssi/src/silc/core/silc-servers.c
+		sed -i -e "s:\"term_type\":\"term_charset\":" \
+			irssi/src/fe-text/term.c
+	fi
+	econf --with-helpdir=${D}/usr/share/irssi/help/silc/ \
+		--without-libtoolfix \
+		--enable-static \
+		`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 "To make full use of silc-plugin, you should load the following perl scripts"
+	einfo "into irssi:"
+	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."
+}