Revision bump. Pull in a patch from upstream that should fix bug #101640.

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 110 insertions, 9 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index c77190ffcdb8..13177744d71c 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.96 2006/08/03 22:05:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.97 2006/10/13 11:28:44 swegener Exp $
+
+*irssi-0.8.10-r4 (13 Oct 2006)
+
+  13 Oct 2006; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-0.8.10-line-split.patch, +irssi-0.8.10-r4.ebuild:
+  Revision bump. Pull in a patch from upstream that should fix bug #101640.
 
   03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   irssi-0.8.10-r3.ebuild:
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 46a615383006..bc3307b0b224 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -5,6 +5,10 @@ AUX irssi-0.8.10-dcc-segv.patch 375 RMD160 f40bc076227ec8f734a708bbd54a2c50c02f5
 MD5 3af168cfb7b1a624b165c50882a064bf files/irssi-0.8.10-dcc-segv.patch 375
 RMD160 f40bc076227ec8f734a708bbd54a2c50c02f54c9 files/irssi-0.8.10-dcc-segv.patch 375
 SHA256 b9c0735b7b4eb5283052eaa91c558e66dadc07f191f5bee2f33fdb426c1ae731 files/irssi-0.8.10-dcc-segv.patch 375
+AUX irssi-0.8.10-line-split.patch 575 RMD160 dd9128d9a91d7b2afd0e449d89cd90d2275aa821 SHA1 8ac3ada93c9299203029caa47d7b091fd55f3cbe SHA256 dba9c567fcf4663b84927d713aeb951915e0080ceca2dd073664973e1952db9d
+MD5 7321422494c6fe10f33eccd08cfd2451 files/irssi-0.8.10-line-split.patch 575
+RMD160 dd9128d9a91d7b2afd0e449d89cd90d2275aa821 files/irssi-0.8.10-line-split.patch 575
+SHA256 dba9c567fcf4663b84927d713aeb951915e0080ceca2dd073664973e1952db9d files/irssi-0.8.10-line-split.patch 575
 AUX irssi-socks-fix.patch 551 RMD160 e9b9e9cc1aa433887aab3dfe2011cfc3500a737a SHA1 b483544df582e5726a3588067f60d249c9e5f130 SHA256 e169b5ff5ef6fef8167bc75a76d8c05fcc27f1b84cb89b8190e451974cd2bdd3
 MD5 c3b74cff45778ccaab4b0c05f85139cd files/irssi-socks-fix.patch 551
 RMD160 e9b9e9cc1aa433887aab3dfe2011cfc3500a737a files/irssi-socks-fix.patch 551
@@ -14,14 +18,18 @@ EBUILD irssi-0.8.10-r3.ebuild 1598 RMD160 06611898654746cb3ff3e0f95e3fac899419af
 MD5 8f7fa07dbf1f750972cbc17f25cd6d57 irssi-0.8.10-r3.ebuild 1598
 RMD160 06611898654746cb3ff3e0f95e3fac899419afcc irssi-0.8.10-r3.ebuild 1598
 SHA256 956d6c808e43070b6918c23d55dd07b45ff50215e4ccfda7bcc1462622024459 irssi-0.8.10-r3.ebuild 1598
+EBUILD irssi-0.8.10-r4.ebuild 1430 RMD160 e93ac9c27a35ca08ed29e0987aede6c41aba1b92 SHA1 b2dc2c810b0380629f86ddc52997b0559adcb7ed SHA256 e8b8a672afdf801af9d79d452795721f7f7b1e47ba365a544a7ff7475ebac441
+MD5 e9c020283e2b2da2101838198d9fc9bc irssi-0.8.10-r4.ebuild 1430
+RMD160 e93ac9c27a35ca08ed29e0987aede6c41aba1b92 irssi-0.8.10-r4.ebuild 1430
+SHA256 e8b8a672afdf801af9d79d452795721f7f7b1e47ba365a544a7ff7475ebac441 irssi-0.8.10-r4.ebuild 1430
 EBUILD irssi-0.8.10.ebuild 1935 RMD160 ff5f4638faab4aeac2eded1662228100b906548d SHA1 5da2ef525513d1845e0452fbcb33f34d730557d5 SHA256 3a8772fcf97771d0749455e98102a6c7a368b3b87d8f206270d18d9fe35193fe
 MD5 9e9726875dd602e865db71bb038b06a5 irssi-0.8.10.ebuild 1935
 RMD160 ff5f4638faab4aeac2eded1662228100b906548d irssi-0.8.10.ebuild 1935
 SHA256 3a8772fcf97771d0749455e98102a6c7a368b3b87d8f206270d18d9fe35193fe irssi-0.8.10.ebuild 1935
-MISC ChangeLog 13496 RMD160 8d23f4fa3de1df035ebc0f9d8b49ee9e05486d8b SHA1 5809b4d17264434272b4c45f6b369589555c19b3 SHA256 f70b9c409beed5747665321f3a2d0fdec5dd7fcb8dccdb5ad5ac00cd5991aa8d
-MD5 10c691f2f11d3dfc0eb3732de47d251d ChangeLog 13496
-RMD160 8d23f4fa3de1df035ebc0f9d8b49ee9e05486d8b ChangeLog 13496
-SHA256 f70b9c409beed5747665321f3a2d0fdec5dd7fcb8dccdb5ad5ac00cd5991aa8d ChangeLog 13496
+MISC ChangeLog 13720 RMD160 57dc5e8c8dff6aca39649845d99db4babb0d12b9 SHA1 cf6f1dd13808e23480e40dc6d38dc4c7d7429d53 SHA256 1144e9320c001340065b66e558297c697cd6c31f51e6d57090a660b3ffcc8b79
+MD5 bdae86997a00aaf0d64b908d30fb2711 ChangeLog 13720
+RMD160 57dc5e8c8dff6aca39649845d99db4babb0d12b9 ChangeLog 13720
+SHA256 1144e9320c001340065b66e558297c697cd6c31f51e6d57090a660b3ffcc8b79 ChangeLog 13720
 MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75
 MD5 13c861176657f4c6fedd0f4d0331e4d4 metadata.xml 270
 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 metadata.xml 270
@@ -32,10 +40,13 @@ SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/di
 MD5 69ba435722f9d4b994e1b15f88115495 files/digest-irssi-0.8.10-r3 241
 RMD160 0cf93da2e9af40d771aeb0879d0aa596dc21dac7 files/digest-irssi-0.8.10-r3 241
 SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/digest-irssi-0.8.10-r3 241
+MD5 69ba435722f9d4b994e1b15f88115495 files/digest-irssi-0.8.10-r4 241
+RMD160 0cf93da2e9af40d771aeb0879d0aa596dc21dac7 files/digest-irssi-0.8.10-r4 241
+SHA256 1dab7a50598c9d2558e943839307ddbca382a6d660836e4e96938aa751a71c6f files/digest-irssi-0.8.10-r4 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE0nMcKRy60XGEcJIRAio6AJwIsYOcGbRocsyiKsC2zQbGWpsG4gCeNujM
-WdGSnMgqdzzHhlJbp7Gwb68=
-=pNq5
+iD8DBQFFL3h3I1lqEGTUzyQRAtQTAKCFXna3H5sFbOUIDmPSG9wSCBxVXwCfcsQk
+LV3DBVcx+Bcblw3w8SB8Tzw=
+=NqEg
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi/files/digest-irssi-0.8.10-r4 b/net-irc/irssi/files/digest-irssi-0.8.10-r4
new file mode 100644
index 000000000000..ac460babc5dd
--- /dev/null
+++ b/net-irc/irssi/files/digest-irssi-0.8.10-r4
@@ -0,0 +1,3 @@
+MD5 4b83d4047670eb75bd14ae1bdd68dc38 irssi-0.8.10.tar.bz2 933152
+RMD160 d2deaca1bf81184b6120bf5804de73b3ef0ac37b irssi-0.8.10.tar.bz2 933152
+SHA256 47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c irssi-0.8.10.tar.bz2 933152
diff --git a/net-irc/irssi/files/irssi-0.8.10-line-split.patch b/net-irc/irssi/files/irssi-0.8.10-line-split.patch
new file mode 100644
index 000000000000..fd2633034093
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.10-line-split.patch
@@ -0,0 +1,23 @@
+Index: src/core/line-split.c
+===================================================================
+--- src/core/line-split.c	(revision 1501)
++++ src/core/line-split.c	(revision 4381)
+@@ -90,6 +90,7 @@
+ int line_split(const char *data, int len, char **output, LINEBUF_REC **buffer)
+ {
+ 	LINEBUF_REC *rec;
++	int ret;
+ 
+ 	g_return_val_if_fail(data != NULL, -1);
+ 	g_return_val_if_fail(output != NULL, -1);
+@@ -122,8 +123,9 @@
+ 		}
+ 	}
+ 
++	ret = remove_newline(rec);
+ 	*output = rec->str;
+-	return remove_newline(rec);
++	return ret;
+ }
+ 
+ void line_split_free(LINEBUF_REC *buffer)
diff --git a/net-irc/irssi/irssi-0.8.10-r4.ebuild b/net-irc/irssi/irssi-0.8.10-r4.ebuild
new file mode 100644
index 000000000000..db757c1b3259
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.10-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10-r4.ebuild,v 1.1 2006/10/13 11:28:44 swegener Exp $
+
+inherit perl-module eutils flag-o-matic
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 perl ssl socks5"
+
+RDEPEND="!net-irc/irssi-svn
+	sys-libs/ncurses
+	>=dev-libs/glib-2.2.1
+	ssl? ( dev-libs/openssl )
+	perl? ( dev-lang/perl )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-dcc-segv.patch
+	epatch "${FILESDIR}"/${P}-line-split.patch
+}
+
+src_compile() {
+	# Irssi uses extern inlines and that needs at least -O
+	is-flag "-O*" || append-flags -O
+
+	econf \
+		--with-proxy \
+		--with-ncurses \
+		--with-perl-lib=vendor \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		install || die "make install failed"
+
+	use perl && fixlocalpod
+
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+}