Fix build on amd64. Fixes bug #105260.

(Portage version: 2.1_pre4-r1)

4 files changed, 160 insertions, 11 deletions

diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index 1cd28393a681..b3742326443f 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/silc-plugin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.18 2006/01/08 15:39:14 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.19 2006/02/15 00:54:53 metalgod Exp $
+
+*silc-plugin-1.0.1-r5 (15 Feb 2006)
+
+  15 Feb 2006; Luis Medinas <metalgod@gentoo.org>
+  +silc-plugin-1.0.1-r5.ebuild:
+  Fix build on amd64. Fixes bug #105260.
 
   08 Jan 2006; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r4.ebuild:
   Use fixlocalpod from perl-module.eclass to fix the file collision for
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index b591e0765c86..00255e077d1d 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -1,16 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 40ce1d2bdcb86f8342195c5e2e8154dd ChangeLog 3843
+RMD160 d7ca947b870b103f9e21f6df4379ec572d945045 ChangeLog 3843
+SHA256 dfe8c150407392e63a0affb723fa296fabbc0831c9a6e7d5fb4d11b534e10ce8 ChangeLog 3843
 MD5 71989b1101d6cf41e9f61a1b62d2cc85 files/1.0.1-branch-update.patch 6717
+RMD160 b6e422fdf91baf3fbe9313e83d3a37e6d771a131 files/1.0.1-branch-update.patch 6717
+SHA256 fa270bbc65eb6a16cd628ece425b15b68ed6e752d4763a60286f13c1bd6efc5e files/1.0.1-branch-update.patch 6717
 MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
+RMD160 549d08e8ffa80a2ac2bb945b0a81a6b7d4cdb0ad files/1.0.1-gcc34.patch 471
+SHA256 6111df03ff5cb884bdce3566e3add9719c17894443644d40daee7967eaa3abe2 files/1.0.1-gcc34.patch 471
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r4 202
+RMD160 b90b57cd424eb7c10a05d98d91209573efa54a21 files/digest-silc-plugin-1.0.1-r4 202
+SHA256 6e49f3e3f8a9fe0ad368a0bbcd3c58319146b6adb9acc50a4d4247375fcd2d8b files/digest-silc-plugin-1.0.1-r4 202
+MD5 c2e9f3744d81f9a3cb38bb3c3ef16846 files/digest-silc-plugin-1.0.1-r5 744
+RMD160 04b946b3e3c5828238c77df1cf52d665265e6961 files/digest-silc-plugin-1.0.1-r5 744
+SHA256 3669b3f44283bdbe79892374c636430efe3176f8a1893e7a95814346289c487e files/digest-silc-plugin-1.0.1-r5 744
 MD5 3d21d1bc81cfd81bfd0b0b3b2123b71c metadata.xml 271
+RMD160 5216a9aae0f65dab3a1be84a9e6091b201a76f3a metadata.xml 271
+SHA256 f5a363461f7e4e9d8d8a9ea60872d6ee71ab8914d303c62d3f529e0e972c24ca metadata.xml 271
 MD5 ea462b09ce22f10f19ffbd2ebb547333 silc-plugin-1.0.1-r4.ebuild 3460
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwTKFQlM6RnzZP+IRAvOjAKCCPg1jCaRCXD6B5yeEvrN1ofbVUgCfV1a9
-oh7hycDFXV3GEvP/by1/Seg=
-=qaUK
------END PGP SIGNATURE-----
+RMD160 cd178e365d2484d4f7d97692387f012654da78d8 silc-plugin-1.0.1-r4.ebuild 3460
+SHA256 1c72e94d729e7236928d28934c5cc9e5b1aa4447da945db2ba7e7352c37f1b16 silc-plugin-1.0.1-r4.ebuild 3460
+MD5 e92c60657c091ddc71e744de9e181b13 silc-plugin-1.0.1-r5.ebuild 3663
+RMD160 2cc7b6f708594f310c10b735ae12188e244ac4e6 silc-plugin-1.0.1-r5.ebuild 3663
+SHA256 9e6bf5a5ddf46ea47e4ab01eace51b5a9707ce87cbf9f9fa44c83ffab943c394 silc-plugin-1.0.1-r5.ebuild 3663
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5
new file mode 100644
index 000000000000..76730a407704
--- /dev/null
+++ b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5
@@ -0,0 +1,9 @@
+MD5 6610ee0e27922f447e40828cf7dee507 irssi-0.8.9.tar.bz2 816465
+RMD160 7a0a2a639c041802bfddd458c35bccaec8084013 irssi-0.8.9.tar.bz2 816465
+SHA256 230ffa21a97f930000e0004f18cf5b709d5da5408d297e1567538a53cf91c32c irssi-0.8.9.tar.bz2 816465
+MD5 6e086ddb21dc18e706750f43412f6b93 silc-client-1.0.1.tar.gz 1862493
+RMD160 007ff291d9d7481a646b24161b75be3a963a27b2 silc-client-1.0.1.tar.gz 1862493
+SHA256 e53961ac6b79d150e0d3a1fa3e0e6220831402c9c50d699add00d82309682426 silc-client-1.0.1.tar.gz 1862493
+MD5 986c750f2dac66838e3db505341923df silc-plugin-1.0.1.tar.gz 24789
+RMD160 da196e12573032adcd22ed89de65e1f160a43ef3 silc-plugin-1.0.1.tar.gz 24789
+SHA256 af32e6bcd2b72dc2fb09c691c2be98f6c107845d45f47b34ac465b5d0ca7238f silc-plugin-1.0.1.tar.gz 24789
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild
new file mode 100644
index 000000000000..37f79764202c
--- /dev/null
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2006 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-r5.ebuild,v 1.1 2006/02/15 00:54:53 metalgod Exp $
+
+inherit eutils perl-module
+
+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="~amd64 ~ppc ~sparc ~x86"
+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_rc1" ; 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
+
+	local myconf
+
+	myconf="--without-libtoolfir --enable-static \
+		--with-helpdir=${D}/usr/share/irssi/help/silc/"
+
+	if use debug ; then
+		myconf="${myconf} --enable-debug"
+	else
+		myconf="${myconf} --disable-debug"
+	fi
+
+	if use amd64; then
+		myconf="${myconf} --with-pic"
+	else
+		myconf="${myconf} --with-pic"
+	fi
+
+	econf ${myconf} || die "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
+
+	fixlocalpod
+}
+
+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."
+}