Added Hebrew patch. Closes bug #26181

4 files changed, 57 insertions, 23 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index e03642c9e607..2e1ccd619c8a 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.25 2003/08/06 12:40:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.26 2003/08/20 02:08:36 gregf Exp $
+
+  19 Aug 2003; Greg Fitzgerald <gregf@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  files/bitchx-1.0.19-hebrew.patch:
+  Added Hebrew Patch, This closes bug #26181
 
   06 Aug 2003; Patrick Kursawe <phosphan@gentoo.org> bitchx-1.0.19-r5.ebuild:
   Updated homepage and SRC_URI
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index 91e55073ab2d..d0a542afdc8a 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -1,8 +1,9 @@
-MD5 50d6ffa7a05fc53f28cf2a2ba21d0b62 ChangeLog 4358
-MD5 8c7272505f7ad4898deb733bc108a179 bitchx-1.0.19-r5.ebuild 3304
+MD5 f899d31f56f435c44ac83f9beae191eb ChangeLog 4512
+MD5 5c7d583f1f3be0370df65dc3f1c3e780 bitchx-1.0.19-r5.ebuild 3671
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r5 136
 MD5 10a57b14bb58910e1f373fbc1b8b2197 files/bitchx-1.0.19-cjk.patch 7050
 MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-security.patch 332
 MD5 04374fc6080f46b1c3e9318e3ab657cf files/bitchx-1.0.19-security2.patch 5529
 MD5 6a18811962d6992f9175f98d771d3d30 files/bitchx-1.0.19-gcc-3.3.patch 472
+MD5 9230369276af6c8a1cdd7a584927cd47 files/bitchx-1.0.19-hebrew.patch 477
diff --git a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild b/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
index 6513c378428a..49864d081199 100644
--- a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
+++ b/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.19-r5.ebuild,v 1.10 2003/08/06 12:40:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.19-r5.ebuild,v 1.11 2003/08/20 02:08:36 gregf Exp $
 
 inherit flag-o-matic eutils
-replace-flags -O[3-9] -O2
-[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+
+IUSE="ssl esd gnome xmms ncurses ipv6 gtk cjk"
 
 MY_P=ircii-pana-${PV/.0./.0c}
+S=${WORKDIR}/BitchX
 DESCRIPTION="An IRC Client"
-HOMEPAGE="http://www.bitchx.org/"
-SRC_URI="http://bitchx.org/files/source/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.bitchx.com/pub/BitchX/source/${MY_P}.tar.gz"
+HOMEPAGE="http://www.bitchx.com/"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc"
-IUSE="ssl esd gnome xmms ncurses ipv6 gtk cjk debug"
+
+replace-flags -O[3-9] -O2
+
+# BitchX needs to be merged with -fPIC on alpha boxes
+# This fixes bug 10932
+[ "${ARCH}" = "alpha" ] && append-flags "-fPIC"
+
+# hppa need -fPIC too
+[ "${ARCH}" = "hppa" ] && append-flags "-fPIC"
 
 DEPEND=">=sys-libs/ncurses-5.1 
 	ssl? ( >=dev-libs/openssl-0.9.6 )
@@ -27,29 +35,42 @@ DEPEND=">=sys-libs/ncurses-5.1
 		>=media-libs/imlib-1.9.10-r1 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
-S=${WORKDIR}/BitchX
-
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
 
 	use cjk && epatch ${FILESDIR}/${P}-cjk.patch
 	epatch ${FILESDIR}/${P}-gcc-3.3.patch
-	epatch ${FILESDIR}/${P}-security.patch
-	epatch ${FILESDIR}/${P}-security2.patch
+	epatch ${FILESDIR}/${P}-security.patch || die
+	epatch ${FILESDIR}/${P}-security2.patch || die
+	epatch ${FILESDIR}/${P}-hebrew.patch || die
 }
 
 src_compile() {
 	local myconf
 
+	if [ "${DEBUG}" ]
+	then
+		einfo "debugging"
+		myconf="${myconf} --enable-debug"
+	fi
+
+	use ssl \
+		&& myconf="${myconf} --with-ssl" \
+		|| myconf="${myconf} --without-ssl"
+
 	use esd && use gtk \
 		&& myconf="${myconf} --enable-sound" \
 		|| myconf="${myconf} --disable-sound"
 	
 	use gtk && use gnome\
-		&& myconf="${myconf} --with-gtk" \
+	    && myconf="${myconf} --with-gtk" \
 		|| myconf="${myconf} --without-gtk"
 
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6" \
+		|| myconf="${myconf} --disable-ipv6"
+
 	#not tested
 	#use ncurses \
 	#	&& myconf="${myconf} --without-tgetent" \
@@ -71,13 +92,9 @@ src_compile() {
 		einfo "gtkBitchX will be built, if you want BitchX please issue"
 		einfo "USE="-gtk" emerge bitchx" 
 		sleep 10
-	) && CFLAGS="${CFLAGS} -I/usr/include/gnome-1.0"
+		) && CFLAGS="${CFLAGS} -I/usr/include/gnome-1.0"
 	
-	econf \
-		CFLAGS="${CFLAGS}" \
-		`use_enable debug` \
-		`use_with ssl` \
-		`use_enable ipv6` \
+	econf CFLAGS="${CFLAGS}" \
 		--enable-cdrom \
 		--with-plugins \
 		${myconf} || die
@@ -85,7 +102,8 @@ src_compile() {
 
 }
 
-src_install() {
+src_install () {
+
 	einstall || die
 
 	rm ${D}/usr/share/man/man1/BitchX*
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch b/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch
new file mode 100644
index 000000000000..d37c2fc574e1
--- /dev/null
+++ b/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch
@@ -0,0 +1,11 @@
+--- include/config.h	2003-08-01 11:46:02.000000000 +0000
++++ include/config.h	2003-08-01 11:46:43.000000000 +0000
+@@ -239,7 +239,7 @@
+  * in the client. defining this variable to 1 allows that happen. It also
+  * adds a HEBREW_TOGGLE variable which can turn this feature on/off
+  */
+-#undef WANT_HEBREW
++#define WANT_HEBREW
+ 
+ /* if you use cidentd the filename is called .authlie instead of .noident.
+  * as well some modifications to the format of the file were made. So we