fix bug #183149

Package-Manager: portage-2.1.3_rc6

5 files changed, 126 insertions, 6 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index e318ab67d10d..c259d141e0de 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/bitchx
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.63 2006/11/19 02:16:29 compnerd Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.64 2007/07/17 10:51:53 lu_zero Exp $
+
+*bitchx-1.1-r4 (17 Jul 2007)
+
+  17 Jul 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/1.1/bitchx-1.1-pbxs.patch, +bitchx-1.1-r4.ebuild:
+  fix bug #183149
 
   19 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> -bitchx-1.1-r1.ebuild,
   -bitchx-1.1-r2.ebuild:
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index 6d8f73d6e112..5c22c8ddbacc 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -26,6 +26,10 @@ AUX 1.1/bitchx-1.1-hebrew.patch 477 RMD160 482fdfeffc2549f728fede5882a2360269fe1
 MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
 RMD160 482fdfeffc2549f728fede5882a2360269fe13eb files/1.1/bitchx-1.1-hebrew.patch 477
 SHA256 5090acf698cea3a22a2a663af4914c580b3508a5bc5cabdedcb21cd3c6d27a17 files/1.1/bitchx-1.1-hebrew.patch 477
+AUX 1.1/bitchx-1.1-pbxs.patch 350 RMD160 21dc3bf478099f2c7197f3d9830d99cb68ec5411 SHA1 d63308f41ef5d910969f430520f0f0c0b0dfdde2 SHA256 64a3c7628ba8460924b81243d3052203b841583eb6e0306812a5e825db22ee2c
+MD5 5f8b251c155a93432294dd944e39aee9 files/1.1/bitchx-1.1-pbxs.patch 350
+RMD160 21dc3bf478099f2c7197f3d9830d99cb68ec5411 files/1.1/bitchx-1.1-pbxs.patch 350
+SHA256 64a3c7628ba8460924b81243d3052203b841583eb6e0306812a5e825db22ee2c files/1.1/bitchx-1.1-pbxs.patch 350
 AUX BitchX-64bit.patch 1135 RMD160 645e192d449ac5bae976e105797cc561b78950b7 SHA1 91386fd2e664090ca54c62c0dd4d0716ca95fda1 SHA256 759670da659d826d4b109f136bbe3b3222b064af78822f3218fd9490d696099e
 MD5 5d622c032159806be3bfc78640da3eb0 files/BitchX-64bit.patch 1135
 RMD160 645e192d449ac5bae976e105797cc561b78950b7 files/BitchX-64bit.patch 1135
@@ -39,10 +43,14 @@ EBUILD bitchx-1.1-r3.ebuild 2220 RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2
 MD5 037a214ce9aa81823cd7b683a608f711 bitchx-1.1-r3.ebuild 2220
 RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2 bitchx-1.1-r3.ebuild 2220
 SHA256 03d99f9bf7126cfccce77ac9fcb432fd3ef8d03ae783ca57cda89193f7c51a2a bitchx-1.1-r3.ebuild 2220
-MISC ChangeLog 9983 RMD160 7e7392d42a78a4b11a180738d243d69f6f0e3ff6 SHA1 e5158624f77db3b146e512fc98ea24bd5552a78a SHA256 6791c34ecb9c4a0de856bbb8abed8f8ff8cf03952eddc6ce8839b4ef563f1b51
-MD5 75fb2756f5ab73952688a209f71e3cd5 ChangeLog 9983
-RMD160 7e7392d42a78a4b11a180738d243d69f6f0e3ff6 ChangeLog 9983
-SHA256 6791c34ecb9c4a0de856bbb8abed8f8ff8cf03952eddc6ce8839b4ef563f1b51 ChangeLog 9983
+EBUILD bitchx-1.1-r4.ebuild 2262 RMD160 fc727e2a2fc8397cd4ce413b2799b539df6e611f SHA1 8e287e40585a19fe4895619b0aac2ff62fcb0cac SHA256 48d4d5cbc85d07739732102012d239b78fe20b9f7e0599cd3db0403f13ef120d
+MD5 8f30cab38d657c82cbddbcfe78c72189 bitchx-1.1-r4.ebuild 2262
+RMD160 fc727e2a2fc8397cd4ce413b2799b539df6e611f bitchx-1.1-r4.ebuild 2262
+SHA256 48d4d5cbc85d07739732102012d239b78fe20b9f7e0599cd3db0403f13ef120d bitchx-1.1-r4.ebuild 2262
+MISC ChangeLog 10139 RMD160 e0f057b51f6e1fc5165328af05cc84fc975307c0 SHA1 7df01b224e0b73d0f1b941e5731dcda027d478e6 SHA256 11ef25a865e9cea15b3b956e19355ca814cf4195a0858206874fb9307faee2e7
+MD5 564af89c1aa3e9450610188b99b51114 ChangeLog 10139
+RMD160 e0f057b51f6e1fc5165328af05cc84fc975307c0 ChangeLog 10139
+SHA256 11ef25a865e9cea15b3b956e19355ca814cf4195a0858206874fb9307faee2e7 ChangeLog 10139
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -50,3 +58,6 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 1873b03a5006711d41c6a2093e662bb4 files/digest-bitchx-1.1-r3 265
 RMD160 3f0d1b70efd0af5e4da21cac283df25bcb5fbd24 files/digest-bitchx-1.1-r3 265
 SHA256 b887ce873dac0187a49aed011e373bd906a47eb07bb57cf9ab8c19679dd6b5b9 files/digest-bitchx-1.1-r3 265
+MD5 1873b03a5006711d41c6a2093e662bb4 files/digest-bitchx-1.1-r4 265
+RMD160 3f0d1b70efd0af5e4da21cac283df25bcb5fbd24 files/digest-bitchx-1.1-r4 265
+SHA256 b887ce873dac0187a49aed011e373bd906a47eb07bb57cf9ab8c19679dd6b5b9 files/digest-bitchx-1.1-r4 265
diff --git a/net-irc/bitchx/bitchx-1.1-r4.ebuild b/net-irc/bitchx/bitchx-1.1-r4.ebuild
new file mode 100644
index 000000000000..a6fdf645ec96
--- /dev/null
+++ b/net-irc/bitchx/bitchx-1.1-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r4.ebuild,v 1.1 2007/07/17 10:51:53 lu_zero Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=ircii-pana-${PV}-final
+S=${WORKDIR}/BitchX
+DESCRIPTION="An IRC Client"
+HOMEPAGE="http://www.bitchx.org/"
+SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc sh sparc x86"
+IUSE="cjk ipv6 ssl"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	use cjk && epatch "${FILESDIR}"/${PV}/${P}-cjk.patch
+	epatch "${FILESDIR}"/${PV}/${P}-pbxs.patch
+	epatch "${FILESDIR}"/${PV}/${P}-hebrew.patch
+	epatch "${FILESDIR}"/${PV}/${P}-freenode.patch
+	epatch "${FILESDIR}"/${PV}/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${PV}/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${PV}/${P}-headers.patch
+	epatch "${FILESDIR}"/${PV}/${P}-build.patch
+	epatch "${FILESDIR}"/fPIC.patch
+	epatch "${FILESDIR}"/BitchX-64bit.patch
+
+	sed -i \
+		-e "s/#undef LATIN1/#define LATIN1 ON/;" \
+		include/config.h
+}
+
+src_compile() {
+	replace-flags -O[3-9] -O2
+	append-flags -fno-strict-aliasing
+
+	# Disable CDROM or else it will take over your CDROM drive
+	local myconf="--disable-cdrom --disable-sound --without-gtk"
+
+	# lamer@gentoo.org BROKEN, will not work with our socks
+	# implementations, is looking for a SOCKSConnect function that our
+	# dante packages don't have :-(
+	# use socks5 \
+	#	&& myconf="${myconf} --with-socks=5" \
+	#	|| myconf="${myconf} --without-socks"
+
+	econf \
+		--with-plugins \
+		$(use_with ssl) \
+		$(use_enable ipv6) \
+		${myconf} || die
+
+	emake || die "make failed"
+	emake -C contrib vh1 || die "make vh1 failed"
+}
+
+src_install () {
+	einstall || die
+	dobin contrib/vh1 || die
+	dosym BitchX-1.1-final /usr/bin/BitchX
+
+	cd "${S}"
+	dodoc bugs Changelog README* IPv6-support
+
+	cd "${S}"/doc
+	insinto /usr/include/X11/bitmaps
+	doins BitchX.xpm || die
+	dodoc README.* *.txt */*.txt tcl/*
+	dohtml -r *
+
+	cd "${S}"/dll
+	docinto plugins
+	dodoc nap/README.nap
+	newdoc acro/README README.acro
+	newdoc arcfour/README README.arcfour
+	newdoc blowfish/README README.blowfish
+	newdoc qbx/README README.qbx
+}
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-pbxs.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-pbxs.patch
new file mode 100644
index 000000000000..550dda05e14f
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-pbxs.patch
@@ -0,0 +1,15 @@
+--- source/hook.c.orig	2003-04-11 03:09:07.000000000 +0200
++++ source/hook.c	2007-07-17 12:02:07.000000000 +0200
+@@ -836,7 +836,11 @@
+ 	
+ #ifdef WANT_TCL
+ 	int		tcl_ret = 0;
+-#endif	
++#endif
++
++        if (which >= NUMBER_OF_LISTS) 
++        	return NO_ACTION_TAKEN;
++
+ 	/*
+ 	 * Figure out where the hooks are for the event type were asserting
+ 	 */
diff --git a/net-irc/bitchx/files/digest-bitchx-1.1-r4 b/net-irc/bitchx/files/digest-bitchx-1.1-r4
new file mode 100644
index 000000000000..5721630b3fc2
--- /dev/null
+++ b/net-irc/bitchx/files/digest-bitchx-1.1-r4
@@ -0,0 +1,3 @@
+MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476
+RMD160 4105de2587964146e2391a26a8a16e3d0059a93f ircii-pana-1.1-final.tar.gz 2532476
+SHA256 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57 ircii-pana-1.1-final.tar.gz 2532476