Added backported fix from upstream CVS, which fixes the /exec command bug on 64-bit arches. Closes bug #57785.

5 files changed, 109 insertions, 3 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 4a0d7b50015f..bb0eb5e98d13 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.50 2004/07/07 22:42:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.51 2004/07/23 22:39:14 swegener Exp $
+
+*irssi-0.8.9-r1 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-0.8.9-64bit-exec-fix.patch, +irssi-0.8.9-r1.ebuild:
+  Added backported fix from upstream CVS, which fixes the /exec command bug on
+  64-bit arches. Closes bug #57785.
 
   08 Jul 2004; Sven Wegener <swegener@gentoo.org> -irssi-0.8.6-r5.ebuild,
   irssi-0.8.6-r6.ebuild, irssi-0.8.9.ebuild:
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index e141c280130c..8796ec8ce509 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,8 +1,11 @@
 MD5 22b77e2f75756985697b817a369f2697 irssi-0.8.6-r6.ebuild 2132
-MD5 2dbe543dfea7a34d6bc6d9d815aa3eed ChangeLog 6705
 MD5 66fbf3744370d75438e10d4d8b6a3900 metadata.xml 250
 MD5 82e5b1bf65384d412b91882279abd6cb irssi-0.8.9.ebuild 2086
-MD5 e75d250d81ec4a41f6bff2130b4d6a0b files/irssi-0.8.6-configure.patch 976
+MD5 d3193fba5f078dce5db010a7850c3962 irssi-0.8.9-r1.ebuild 2259
+MD5 2dbe543dfea7a34d6bc6d9d815aa3eed ChangeLog 6705
 MD5 cb17857da5af4446fef7e94d553277de files/digest-irssi-0.8.6-r6 64
 MD5 d8d32d5f69fd1bccf2928c4bad648cd6 files/digest-irssi-0.8.9 64
+MD5 e75d250d81ec4a41f6bff2130b4d6a0b files/irssi-0.8.6-configure.patch 976
 MD5 fdac3a93d9b1589031a28d5a36029e6d files/irssi-0.8.8-configure.patch 531
+MD5 6613882c525a6f1db208af7fe5905336 files/irssi-0.8.9-64bit-exec-fix.patch 499
+MD5 d8d32d5f69fd1bccf2928c4bad648cd6 files/digest-irssi-0.8.9-r1 64
diff --git a/net-irc/irssi/files/digest-irssi-0.8.9-r1 b/net-irc/irssi/files/digest-irssi-0.8.9-r1
new file mode 100644
index 000000000000..9d7edc53fea6
--- /dev/null
+++ b/net-irc/irssi/files/digest-irssi-0.8.9-r1
@@ -0,0 +1 @@
+MD5 6610ee0e27922f447e40828cf7dee507 irssi-0.8.9.tar.bz2 816465
diff --git a/net-irc/irssi/files/irssi-0.8.9-64bit-exec-fix.patch b/net-irc/irssi/files/irssi-0.8.9-64bit-exec-fix.patch
new file mode 100644
index 000000000000..bd8bd0c9e8e9
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.9-64bit-exec-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur irssi-0.8.9/src/fe-common/core/fe-exec.c irssi-0.8.9-amd64-exec-fix/src/fe-common/core/fe-exec.c
+--- irssi-0.8.9/src/fe-common/core/fe-exec.c	2002-06-07 17:45:07.000000000 +0200
++++ irssi-0.8.9-64bit-exec-fix/src/fe-common/core/fe-exec.c	2004-07-24 00:14:11.965452536 +0200
+@@ -347,7 +347,7 @@
+ static void sig_exec_input_reader(PROCESS_REC *rec)
+ {
+         char tmpbuf[512], *str;
+-        unsigned int recvlen;
++        gsize recvlen;
+ 	int err, ret;
+ 
+ 	g_return_if_fail(rec != NULL);
diff --git a/net-irc/irssi/irssi-0.8.9-r1.ebuild b/net-irc/irssi/irssi-0.8.9-r1.ebuild
new file mode 100644
index 000000000000..9efea1929d0f
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.9-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9-r1.ebuild,v 1.1 2004/07/23 22:39:14 swegener Exp $
+
+IUSE="nls ipv6 perl ssl socks5"
+
+inherit perl-module eutils
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support."
+SRC_URI="http://irssi.org/files/${P}.tar.bz2"
+HOMEPAGE="http://irssi.org/"
+
+RDEPEND="!net-irc/irssi-cvs
+	>=dev-libs/glib-2.2.1
+	sys-libs/ncurses
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-misc/dante-1.1.13 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
+
+SLOT="0"
+LICENSE="GPL-2"
+# Original KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ia64 ppc64 s390"
+# All other KEYWORDS were removed because this ebuild only contains an 64-bit arch fix.
+KEYWORDS="amd64 ia64 ppc64"
+
+src_unpack() {
+	unpack ${A}
+
+	# Ugly hack to work around compression of the html files.
+	# Remove this if prepalldocs is changed to avoid gzipping html files.
+	cd ${S} && \
+	sed -i \
+		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
+			die "sed doc/Makefile.in failed"
+
+	epatch ${FILESDIR}/${P}-64bit-exec-fix.patch
+}
+
+src_compile() {
+	# Note: there is an option to build a GUI for irssi, but according
+	# to the website the GUI is no longer developed, so that option is
+	# not used here.
+	local myconf="--with-glib2 --without-servertest --with-proxy --with-ncurses"
+
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_with perl`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_with socks5 socks`"
+	if use ssl; then
+		myconf="${myconf} --with-openssl-include=/usr --with-openssl-libs=/usr"
+	else
+		myconf="${myconf} --disable-ssl"
+	fi
+
+	econf ${myconf} || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	myflags=""
+
+	if use perl; then
+		cd ${S}/src/perl/common; perl-module_src_prep
+		cd ${S}/src/perl/irc;    perl-module_src_prep
+		cd ${S}/src/perl/textui; perl-module_src_prep
+		cd ${S}/src/perl/ui;     perl-module_src_prep
+		cd ${S}
+	fi
+
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		gnulocaledir=${D}/usr/share/locale \
+		${myflags} \
+		install || die
+
+	prepalldocs
+	dodoc AUTHORS ChangeLog README TODO NEWS
+	cd ${S}/docs
+	dohtml -r . || die "dohtml failed"
+}