Added support for the local cdrom USE flag. Closes bug #55823. Removed older ebuilds.

14 files changed, 37 insertions, 688 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index 6ab576463a91..2495ec29cf11 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.45 2004/06/24 23:01:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.46 2004/07/04 23:19:52 swegener Exp $
+
+*bitchx-1.1-r1 (05 Jul 2004)
+
+  05 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  -files/bitchx-1.0.19-cjk.patch, -files/bitchx-1.0.19-freenode.patch,
+  -files/bitchx-1.0.19-gcc-3.3.patch, -files/bitchx-1.0.19-hebrew.patch,
+  -files/bitchx-1.0.19-nickcomp-nocolor.patch,
+  -files/bitchx-1.0.19-security.patch, -files/bitchx-1.0.19-security2.patch,
+  -bitchx-1.0.19-r5.ebuild, -bitchx-1.0.19-r6.ebuild, +bitchx-1.1-r1.ebuild:
+  Added support for the local cdrom USE flag. Closes bug #55823. Removed older
+  ebuilds.
 
   20 Jun 2004; Sven Wegener <swegener@gentoo.org>
   +files/1.1/bitchx-1.1-gcc34.patch, bitchx-1.1.ebuild:
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index b720801e8b4b..6ff46c22f4f7 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -1,20 +1,11 @@
-MD5 8af780ded2b1a945e014adb2d51d50b4 bitchx-1.1.ebuild 3393
-MD5 0a0bb530ef45a94a4be550c201438d4b bitchx-1.0.19-r6.ebuild 3390
-MD5 82c532ff9a5af5d370d8ae684783e960 ChangeLog 7137
-MD5 53cfd9c172f96d352b0350a00bf83e84 bitchx-1.0.19-r5.ebuild 3505
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r5 136
-MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r6 70
-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 d37e1625d80fafd8d98655472b706214 files/bitchx-1.0.19-freenode.patch 917
+MD5 629744eed7d42c9cdc991d2b19d4d150 ChangeLog 7619
+MD5 8c787bc667849a4ac895209c55bb87d8 bitchx-1.1-r1.ebuild 3403
+MD5 8af780ded2b1a945e014adb2d51d50b4 bitchx-1.1.ebuild 3393
 MD5 5d622c032159806be3bfc78640da3eb0 files/BitchX-64bit.patch 1135
-MD5 553435cb4dc291a662cefb374ad57a1d files/bitchx-1.0.19-nickcomp-nocolor.patch 495
-MD5 6a18811962d6992f9175f98d771d3d30 files/bitchx-1.0.19-gcc-3.3.patch 472
-MD5 9230369276af6c8a1cdd7a584927cd47 files/bitchx-1.0.19-hebrew.patch 477
 MD5 9958cd92ed63cd29972e5c3465ab83aa files/digest-bitchx-1.1 73
-MD5 95973485a5a745af87c7bdc9fb6ca0c6 files/1.1/bitchx-1.1-gcc34.patch 394
-MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
-MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976
+MD5 9958cd92ed63cd29972e5c3465ab83aa files/digest-bitchx-1.1-r1 73
 MD5 10a57b14bb58910e1f373fbc1b8b2197 files/1.1/bitchx-1.1-cjk.patch 7050
+MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976
+MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
+MD5 95973485a5a745af87c7bdc9fb6ca0c6 files/1.1/bitchx-1.1-gcc34.patch 394
diff --git a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild b/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
deleted file mode 100644
index 92d3d4eba1a6..000000000000
--- a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.18 2004/06/24 23:01:51 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="ssl esd gnome xmms ipv6 gtk cjk"
-
-MY_P=ircii-pana-${PV/.0./.0c}
-S=${WORKDIR}/BitchX
-DESCRIPTION="An IRC Client"
-SRC_URI="http://www.bitchx.org/files/source/old/${MY_P}.tar.gz"
-HOMEPAGE="http://www.bitchx.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-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 )
-	xmms? ( media-sound/xmms )
-	esd? ( >=media-sound/esound-0.2.5
-		>=media-libs/audiofile-0.1.5 )
-	gtk? ( =x11-libs/gtk+-1.2*
-		>=media-libs/imlib-1.9.10-r1 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-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 || 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} --without-gtk"
-
-	use ipv6 \
-		&& myconf="${myconf} --enable-ipv6" \
-		|| myconf="${myconf} --disable-ipv6"
-
-
-	# 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"
-
-	mv ${S}/include/config.h ${S}/include/config.h.orig
-	sed -e "s/#undef LATIN1/#define LATIN1 ON/;" \
-		${S}/include/config.h.orig > \
-		${S}/include/config.h
-	#ugly workaround
-	use gtk && use gnome && ( \
-		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"
-
-	econf CFLAGS="${CFLAGS}" \
-		--enable-cdrom \
-		--with-plugins \
-		${myconf} || die
-	emake || die
-
-}
-
-src_install () {
-
-	einstall || die
-
-	rm ${D}/usr/share/man/man1/BitchX*
-	doman doc/BitchX.1
-
-	use gnome && use gtk && ( \
-		exeinto /usr/bin
-	#	newexe ${S}/source/BitchX BitchX-1.0c19
-		dosym gtkBitchX-1.0c19 /usr/bin/gtkBitchX
-		einfo "Installed gtkBitchX"
-	) || dosym BitchX-1.0c19 /usr/bin/BitchX
-
-	chmod -x ${D}/usr/lib/bx/plugins/BitchX.hints
-
-	cd ${S}
-	dodoc Changelog README* IPv6-support COPYING
-	cd doc
-	insinto /usr/X11R6/include/bitmaps
-	doins BitchX.xpm
-
-	dodoc BitchX-* BitchX.bot *.doc BitchX.faq README.hooks
-	dodoc bugs *.txt functions ideas mode tcl-ideas watch
-	dodoc *.tcl
-	dohtml *.html
-
-	docinto plugins
-	dodoc plugins
-	cd ../dll
-	insinto /usr/lib/bx/wav
-	doins wavplay/*.wav
-	cp acro/README acro/README.acro
-	dodoc acro/README.acro
-	cp arcfour/README arcfour/README.arcfour
-	dodoc arcfour/README.arcfour
-	cp blowfish/README blowfish/README.blowfish
-	dodoc blowfish/README.blowfish
-	dodoc nap/README.nap
-	cp qbx/README qbx/README.qbx
-	dodoc qbx/README.qbx
-}
diff --git a/net-irc/bitchx/bitchx-1.0.19-r6.ebuild b/net-irc/bitchx/bitchx-1.1-r1.ebuild
index 563d13ccb5fe..c675b9a1f965 100644
--- a/net-irc/bitchx/bitchx-1.0.19-r6.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r1.ebuild
@@ -1,47 +1,47 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.19-r6.ebuild,v 1.17 2004/06/24 23:01:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.1 2004/07/04 23:19:52 swegener Exp $
 
 inherit flag-o-matic eutils
 
-MY_P=ircii-pana-${PV/.0./.0c}
+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/old/${MY_P}.tar.gz"
+SRC_URI="http://www.bitchx.org/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc hppa ~alpha"
-IUSE="ssl esd gnome xmms ipv6 gtk cjk"
+KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
+IUSE="ssl esd gnome xmms ipv6 gtk cjk cdrom"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	xmms? ( media-sound/xmms )
 	ncurses? ( sys-libs/ncurses )
+	!arm? (
+	xmms? ( media-sound/xmms )
 	esd? ( >=media-sound/esound-0.2.5
 		>=media-libs/audiofile-0.1.5 )
 	gtk? ( =x11-libs/gtk+-1.2*
 		>=media-libs/imlib-1.9.10-r1 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )"
 
 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}-hebrew.patch
-	epatch ${FILESDIR}/${P}-nickcomp-nocolor.patch
-	epatch ${FILESDIR}/${P}-freenode.patch
+	use cjk && epatch ${FILESDIR}/${PV}/${P}-cjk.patch
+	epatch ${FILESDIR}/${PV}/${P}-hebrew.patch
+	epatch ${FILESDIR}/${PV}/${P}-freenode.patch
+	epatch ${FILESDIR}/${PV}/${P}-gcc34.patch
+	use amd64 && epatch ${FILESDIR}/BitchX-64bit.patch
 }
 
 src_compile() {
 	# BitchX needs to be merged with -fPIC on alpha/hppa boxes #10932
 	[ "${ARCH}" == "alpha" ] && append-flags "-fPIC"
 	[ "${ARCH}" == "hppa" ] && append-flags "-fPIC"
+	[ "${ARCH}" == "amd64" ] && append-flags "-fPIC"
 	replace-flags -O[3-9] -O2
 
 	local myconf
@@ -81,8 +81,8 @@ src_compile() {
 
 	econf \
 		CFLAGS="${CFLAGS}" \
-		--enable-cdrom \
 		--with-plugins \
+		`use_enable cdrom` \
 		`use_with ssl` \
 		`use_enable ipv6` \
 		${myconf} || die
@@ -99,9 +99,9 @@ src_install () {
 	use gnome && use gtk && ( \
 		exeinto /usr/bin
 		#newexe ${S}/source/BitchX BitchX-1.0c19
-		dosym gtkBitchX-1.0c19 /usr/bin/gtkBitchX
+		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
 		einfo "Installed gtkBitchX"
-	) || dosym BitchX-1.0c19 /usr/bin/BitchX
+	) || dosym BitchX-1.1-final /usr/bin/BitchX
 
 	fperms a-x /usr/lib/bx/plugins/BitchX.hints
 
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-cjk.patch b/net-irc/bitchx/files/bitchx-1.0.19-cjk.patch
deleted file mode 100644
index 2468784a5a54..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-cjk.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff -ruN include/color.h.orig include/color.h
---- include/color.h.orig	Tue Mar  6 04:38:48 2001
-+++ include/color.h	Tue Jun 18 04:24:21 2002
-@@ -386,15 +386,15 @@
- 
- #define DEFAULT_INPUT_PROMPT "À-[bitchx]Ä> "
- 
--#ifndef ONLY_STD_CHARS
--#define DEFAULT_SHOW_NUMERICS_STR "ùíù"
--#else
--#ifndef LATIN1
-+//#ifndef ONLY_STD_CHARS
-+//#define DEFAULT_SHOW_NUMERICS_STR "ùíù"
-+//#else
-+//#ifndef LATIN1
--#define DEFAULT_SHOW_NUMERICS_STR "***"
--#else
-+//#else
-+//#define DEFAULT_SHOW_NUMERICS_STR "-:-"
- #define DEFAULT_SHOW_NUMERICS_STR "-:-"
--#endif
--#endif
-+//#endif
-+//#endif
- 
- 
- #define DEFAULT_SERVER_PROMPT "%K[%c$0%K] "
-diff -ruN include/config.h.orig include/config.h
---- include/config.h.orig	Tue Jun 18 04:23:31 2002
-+++ include/config.h	Tue Jun 18 04:24:21 2002
-@@ -195,7 +195,7 @@
-  * we define the default network type for server groups. Do not just
-  * undefine this.
-  */
-- #define DEFAULT_NETWORK "efnet"
-+ #define DEFAULT_NETWORK "openprojects"
- 
- /*
-  * Below are the IRCII variable defaults.  For boolean variables, use 1 for
-@@ -309,7 +309,7 @@
-  * This is recommended when you want to start BitchX in an xterm without
-  * the usage of the special "vga"-font. 
-  */
--#undef ONLY_STD_CHARS
-+#define ONLY_STD_CHARS 1
- 
- /*
-  * Normally BitchX uses only the IBMPC (cp437) charset.
-@@ -342,7 +342,7 @@
-  * when you've defined LATIN1. The problem is that ansi graphics will look
-  * ugly if you use the scroll up feature (PageUp/PageDown)
-  */
--#undef ASCII_LOGO
-+#define ASCII_LOGO
- 
- /* If you define REVERSE_WHITE_BLACK, then the format codes for black and
-  * white color are revepsed. (%W, %w is bold black and black, %K, %k is bold
-diff -ruN include/irc.h.orig include/irc.h
---- include/irc.h.orig	Sun Mar 24 18:31:04 2002
-+++ include/irc.h	Tue Jun 18 04:24:21 2002
-@@ -14,6 +14,7 @@
- #define IRCII_COMMENT   "\002 Keep it to yourself!\002"
- 
- #define FSET 1
-+#define ishangul(c) ((((unsigned char)(c)) >= 0xa1) && (((unsigned char)(c)) <= 0xfe))
- 
- #ifndef __irc_c
- extern const char irc_version[];
-diff -ruN source/input.c.orig source/input.c
---- source/input.c.orig	Sun Mar 24 18:31:06 2002
-+++ source/input.c	Tue Jun 18 04:24:21 2002
-@@ -94,6 +94,7 @@
- #define MIN_CHAR 		INPUT_BUFFER[MIN_POS]
- #define PREV_CHAR 		INPUT_BUFFER[THIS_POS-1]
- #define NEXT_CHAR 		INPUT_BUFFER[THIS_POS+1]
-+#define NTH_CHAR(offset)        INPUT_BUFFER[THIS_POS+(offset)]
- #define ADD_TO_INPUT(x) 	strmcat(INPUT_BUFFER, (x), INPUT_BUFFER_SIZE);
- #define INPUT_ONSCREEN 		current_screen->input_visible
- #define INPUT_VISIBLE 		INPUT_BUFFER[INPUT_ONSCREEN]
-@@ -478,6 +479,11 @@
- 	cursor_to_input();
- 	if (dir)
- 	{
-+                        if (NEXT_CHAR && ishangul(THIS_CHAR) && ishangul(NEXT_CHAR))
-+                        {
-+                                THIS_POS++;
-+                                term_cursor_right();
-+                        }
- 		if (THIS_CHAR)
- 		{
- 			THIS_POS++;
-@@ -490,6 +496,11 @@
- 		{
- 			THIS_POS--;
- 			term_cursor_left();
-+                        if (THIS_POS > MIN_POS && ishangul(THIS_CHAR) && ishangul(PREV_CHAR))
-+                        {
-+                                THIS_POS--;
-+                                term_cursor_left();
-+                        }
- 		}
- 	}
- 	update_input(NO_UPDATE);
-@@ -584,24 +595,35 @@
- BUILT_IN_KEYBINDING(input_delete_character)
- {
- int	pos;
-+	int hangul_deleted = 0 ;
-+	int count = 1 ;
-+
- 	cursor_to_input();
- 	in_completion = STATE_NORMAL;
--	if (!THIS_CHAR)
--		return;	
--	ov_strcpy(&THIS_CHAR, &NEXT_CHAR);
--	if (!(termfeatures & TERM_CAN_DELETE))
--		update_input(UPDATE_FROM_CURSOR);
--	else
--	{
--		term_delete(1);
--		pos = INPUT_ONSCREEN + last_input_screen->co - 1;
--		if (pos < strlen(INPUT_BUFFER))
-+        if (ishangul(THIS_CHAR)) {
-+                hangul_deleted = 1;
-+                ov_strcpy(&THIS_CHAR, &(NTH_CHAR(2)));
-+        } else {
-+                ov_strcpy(&THIS_CHAR, &(NEXT_CHAR));
-+        }
-+
-+	if (hangul_deleted) count = 2 ;
-+
-+	while (count -- > 0) {
-+		if (!(termfeatures & TERM_CAN_DELETE))
-+			update_input(UPDATE_FROM_CURSOR);
-+		else
- 		{
--			term_move_cursor(last_input_screen->co - 1, INPUT_LINE);
--			term_putchar(INPUT_BUFFER[pos]);
--			term_move_cursor(INPUT_CURSOR, INPUT_LINE);
-+			term_delete(1);
-+			pos = INPUT_ONSCREEN + last_input_screen->co - 1;
-+			if (pos < strlen(INPUT_BUFFER))
-+			{
-+				term_move_cursor(last_input_screen->co - 1, INPUT_LINE);
-+				term_putchar(INPUT_BUFFER[pos]);
-+				term_move_cursor(INPUT_CURSOR, INPUT_LINE);
-+			}
-+			update_input(NO_UPDATE);
- 		}
--		update_input(NO_UPDATE);
- 	}
- }
- 
-@@ -613,7 +635,11 @@
- 	{
- 		char	*ptr = NULL;
- 		int	pos;
-+		int	count = 1 ;
-+
-+                if (ishangul(PREV_CHAR)) count = 2;
- 
-+		while (count-- > 0) {
- 		ptr = LOCAL_COPY(&THIS_CHAR);
- 		strcpy(&(PREV_CHAR), ptr);
- 		THIS_POS--;
-@@ -650,6 +676,7 @@
- 			update_input(UPDATE_FROM_CURSOR);
- #endif
- 		}
-+		}
- 	}
- 	if (THIS_POS == MIN_POS)
- 		HOLDLAST = NULL;
-@@ -688,6 +715,7 @@
- {
- 	cursor_to_input();
- 	THIS_POS = strlen(INPUT_BUFFER);
-+	if (ishangul(THIS_CHAR)) THIS_POS-- ;
- 	update_input(UPDATE_JUST_CURSOR);
- }
- 
-diff -ruN source/ircaux.c.orig source/ircaux.c
---- source/ircaux.c.orig	Thu Feb 28 13:22:49 2002
-+++ source/ircaux.c	Tue Jun 18 04:24:21 2002
-@@ -1040,7 +1040,7 @@
- 		return NULL;
- 
- 	for (s = nick; *s && (s - nick) < NICKNAME_LEN ; s++, len++)
--		if (!islegal(*s) || my_isspace(*s))
-+		if (*s >= 0 && (!islegal(*s) || my_isspace(*s)))
- 			break;
- 	*s = '\0';
- 	
-diff -ruN source/misc.c.orig source/misc.c
---- source/misc.c.orig	Tue Jun 18 05:02:03 2002
-+++ source/misc.c	Tue Jun 18 05:02:17 2002
-@@ -4542,7 +4542,7 @@
- 				tmpc++;
- 				continue;
- 			}
--#if 1
-+#if 0
- /* do we really wanna do this? */
- 			else if (*tmpc == '^') /* ibmpc charset */
- 			{
-
-diff -ruN source/output.c.orig source/output.c
---- source/output.c.orig	Tue Jun 18 05:00:46 2002
-+++ source/output.c	Tue Jun 18 05:01:52 2002
-@@ -53,17 +53,17 @@
- 
- void charset_ibmpc (void)
- {
--	fwrite("\033(U", 3, 1, current_ftarget);	/* switch to IBM code page 437 */
-+	/*fwrite("\033(U", 3, 1, current_ftarget);*/	/* switch to IBM code page 437 */
- }
- 
- void charset_lat1 (void)
- {
--	fwrite("\033(B", 3, 1, current_ftarget);	/* switch to Latin-1 (ISO 8859-1) */
-+	/*fwrite("\033(B", 3, 1, current_ftarget);*/	/* switch to Latin-1 (ISO 8859-1) */
- }
- 
- void charset_cst(void)
- {
--	fwrite("\033(K", 3, 1, current_ftarget); /* switch too user-defined */
-+	/*fwrite("\033(K", 3, 1, current_ftarget);*/ /* switch too user-defined */
- }
- 
- /* currently not used. */
-@@ -75,9 +75,9 @@
- #if !defined(WINNT) && !defined(__EMX__)
- 
- #if defined(HARD_UNFLASH) && !defined(CHARSET_CUSTOM)
--	fwrite("\033c", 5, 1, current_ftarget);		/* hard reset */
-+	/*fwrite("\033c", 5, 1, current_ftarget);*/		/* hard reset */
- #else
--	fwrite("\033)0", 6, 1, current_ftarget);		/* soft reset */
-+	/*fwrite("\033)0", 6, 1, current_ftarget);*/		/* soft reset */
- #endif
- 
- #if defined(LATIN1)
-
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-freenode.patch b/net-irc/bitchx/files/bitchx-1.0.19-freenode.patch
deleted file mode 100644
index 2d1a66ba8f51..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-freenode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- include/config.h.orig	2003-09-05 13:22:09.000000000 -0400
-+++ include/config.h	2003-09-05 13:28:05.000000000 -0400
-@@ -37,7 +37,27 @@
-  *
-  * List last updated: 03/24/01.  -dialtone.
-  */
--#define DEFAULT_SERVER  "[efnet] "\
-+#define DEFAULT_SERVER  "[freenode]" \
-+				"irc.freenode.net "\
-+				"vinge.freenode.net "\
-+				"truong.freenode.net "\
-+				"stephenson.freenode.net "\
-+				"simak.freenode.net "\
-+				"orwell.freenode.net "\
-+				"leguin.freenode.net "\
-+				"kornbluth.freenode.net "\
-+				"jordan.freenode.net "\
-+				"herbert.freenode.net "\
-+				"goethe.freenode.net "\
-+				"gibson.freenode.net "\
-+				"gerrold.freenode.net "\
-+				"carter.freenode.net "\
-+				"carneiro.freenode.net "\
-+				"capek.freenode.net "\
-+				"calkins.freenode.net "\
-+				"brin.freenode.net "\
-+				"adams.freenode.net "\
-+			"[efnet] "\
- 				"irc.Prison.NET "\
- 				"irc.colorado.edu "\
- 				"irc.concentric.net "\
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch b/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch
deleted file mode 100644
index a8709735ab24..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN BitchX.orig/source/status.c BitchX/source/status.c
---- BitchX.orig/source/status.c	2003-06-16 21:31:15.000000000 +0200
-+++ BitchX/source/status.c	2003-06-16 21:31:44.000000000 +0200
-@@ -1213,7 +1213,7 @@
-  * current-type window, although i think they should go to all windows.
-  */
- #define STATUS_VAR(x) \
--static	char	*status_user ## x ## (Window *window)			\
-+static	char	*status_user ## x  (Window *window)			\
- {									\
- 	char	*text;							\
- 									\
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch b/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch
deleted file mode 100644
index d37c2fc574e1..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-hebrew.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-nickcomp-nocolor.patch b/net-irc/bitchx/files/bitchx-1.0.19-nickcomp-nocolor.patch
deleted file mode 100644
index 72a04dd91166..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-nickcomp-nocolor.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/color.h.orig	2001-03-05 14:38:48.000000000 -0500
-+++ include/color.h	2003-09-05 13:10:19.000000000 -0400
-@@ -717,8 +717,8 @@
- 	
- #define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-"
- 
--#define DEFAULT_FORMAT_NICK_COMP_FSET "$0\002:\002$1-"
--#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0\002:\002$1-"
-+#define DEFAULT_FORMAT_NICK_COMP_FSET "$0:$1-"
-+#define DEFAULT_FORMAT_NICK_AUTO_FSET "$0:$1-"
- 
- #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-"
- #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-"
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-security.patch b/net-irc/bitchx/files/bitchx-1.0.19-security.patch
deleted file mode 100644
index fa7eb1217ad0..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- source/funny.c	2003-02-20 16:37:07.000000000 +0000
-+++ source/funny.c	2003-02-20 16:39:13.000000000 +0000
-@@ -261,6 +261,11 @@
- 	channel = Args[1];
- 	line = Args[2];
- 
-+	if (channel == NULL || line == NULL) { 
-+		bitchsay("Invalid number of arguments for %s", __FUNCTION__); 
-+		return; 
-+	} 
-+
- 	ptr = line;
- 	while (*ptr)
- 	{
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-security2.patch b/net-irc/bitchx/files/bitchx-1.0.19-security2.patch
deleted file mode 100644
index e8f6f67504a3..000000000000
--- a/net-irc/bitchx/files/bitchx-1.0.19-security2.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -ru BitchX-old/source/banlist.c BitchX/source/banlist.c
---- BitchX-old/source/banlist.c	2002-02-28 06:22:46.000000000 +0200
-+++ BitchX/source/banlist.c	2003-03-13 20:09:01.000000000 +0200
-@@ -277,30 +277,30 @@
- 		case 7:
- 			if (ip)
- 			{
--				sprintf(banstr, "*!*@%s", cluster(ip));
-+				snprintf(banstr, sizeof(banstr), "*!*@%s", cluster(ip));
- 				break;
- 			}
- 		case 2: /* Better 	*/
--			sprintf(banstr, "*!*%s@%s", t1, cluster(host));
-+			snprintf(banstr, sizeof(banstr), "*!*%s@%s", t1, cluster(host));
- 			break;
- 		case 3: /* Host 	*/
--			sprintf(banstr, "*!*@%s", host);
-+			snprintf(banstr, sizeof(banstr), "*!*@%s", host);
- 			break;
- 		case 4: /* Domain	*/
--			sprintf(banstr, "*!*@*%s", strrchr(host, '.'));
-+			snprintf(banstr, sizeof(banstr), "*!*@*%s", strrchr(host, '.'));
- 			break;
- 		case 5: /* User		*/
--			sprintf(banstr, "*!%s@%s", t, cluster(host));
-+			snprintf(banstr, sizeof(banstr), "*!%s@%s", t, cluster(host));
- 			break;
- 		case 6: /* Screw 	*/
- 			malloc_sprintf(&tmpstr, "*!*%s@%s", t1, host);
--			strcpy(banstr, screw(tmpstr));
-+			strmcpy(banstr, screw(tmpstr), sizeof(banstr)-1);
- 			new_free(&tmpstr);
- 			break;
- 		case 1:	/* Normal 	*/
- 		default:
- 		{
--			sprintf(banstr, "%s!*%s@%s", nick, t1, host);
-+			snprintf(banstr, sizeof(banstr), "%s!*%s@%s", nick, t1, host);
- 			break;
- 		}
- 	}
-diff -ru BitchX-old/source/ctcp.c BitchX/source/ctcp.c
---- BitchX-old/source/ctcp.c	2002-02-28 06:22:47.000000000 +0200
-+++ BitchX/source/ctcp.c	2003-03-13 19:59:35.000000000 +0200
-@@ -1482,6 +1482,7 @@
- 	     *putbuf2;
- 	int len;
- 	len = IRCD_BUFFER_SIZE - (12 + strlen(to));
-+	if (len <= 2) return;
- 	putbuf2 = alloca(len);
- 
- 	if (format)
-diff -ru BitchX-old/source/misc.c BitchX/source/misc.c
---- BitchX-old/source/misc.c	2002-03-24 11:31:07.000000000 +0200
-+++ BitchX/source/misc.c	2003-03-13 20:02:13.000000000 +0200
-@@ -3121,19 +3121,19 @@
- 	{
- 		if (*hostname == '~')
- 			hostname++;
--		strcpy(result, hostname);
-+		strmcpy(result, hostname, sizeof(result)-1);
- 		*strchr(result, '@') = '\0';
- 		if (strlen(result) > 9)
- 		{
- 			result[8] = '*';
- 			result[9] = '\0';
- 		}
--		strcat(result, "@");
-+		strmcat(result, "@", sizeof(result)-1);
- 		if (!(hostname = strchr(hostname, '@')))
- 			return NULL;
- 		hostname++;
- 	}
--	strcpy(host, hostname);
-+	strmcpy(host, hostname, sizeof(host)-1);
- 
- 	if (*host && isdigit(*(host + strlen(host) - 1)))
- 	{
-@@ -3154,8 +3154,8 @@
-                 for (i = 0; i < count; i++)
-                         tmp = strchr(tmp, '.') + 1;
-                 *tmp = '\0';
--                strcat(result, host);
--                strcat(result, "*");
-+                strmcat(result, host, sizeof(result)-1);
-+                strmcat(result, "*", sizeof(result)-1);
- 	}
- 	else
- 	{
-@@ -3177,10 +3177,10 @@
- 			else
- 				return (char *) NULL;
- 		}
--		strcat(result, "*");
-+		strmcat(result, "*", sizeof(result)-1);
- 		if (my_stricmp(host, temphost))
--			strcat(result, ".");
--		strcat(result, host);
-+			strmcat(result, ".", sizeof(result)-1);
-+		strmcat(result, host, sizeof(result)-1);
- 	}
- 	return result;
- }
-diff -ru BitchX-old/source/names.c BitchX/source/names.c
---- BitchX-old/source/names.c	2002-03-25 22:47:30.000000000 +0200
-+++ BitchX/source/names.c	2003-03-13 20:10:26.000000000 +0200
-@@ -572,7 +572,7 @@
- 
-    	*nmodes = 0;
-    	*nargs = 0;
--	for (; *modes; modes++) 
-+	for (; *modes && strlen(nmodes) < sizeof(nmodes)-2; modes++)
- 	{
- 		isbanned = isopped = isvoiced = 0;
- 		switch (*modes) 
-@@ -742,7 +742,7 @@
- 
-    /* modes which can be done multiple times are added here */
- 
--	for (tucm = ucm; tucm; tucm = tucm->next) 
-+	for (tucm = ucm; tucm && strlen(nmodes) < sizeof(nmodes)-2; tucm = tucm->next)
- 	{
- 		if (tucm->o_ed) 
- 		{
-diff -ru BitchX-old/source/notice.c BitchX/source/notice.c
---- BitchX-old/source/notice.c	2002-02-28 06:22:50.000000000 +0200
-+++ BitchX/source/notice.c	2003-03-13 20:07:39.000000000 +0200
-@@ -422,10 +422,10 @@
- 	{
- 		char *q = strchr(line, ':');
- 		char *port = empty_string;
--		int conn = !strncmp(line+7, "connect", 7) ? 1 : 0;
-+		int conn = strlen(line) > 7 && !strncmp(line+7, "connect", 7) ? 1 : 0;
- 		int dalnet = 0, ircnet = 0;
- 
--		if (*(line+18) == ':')
-+		if (strlen(line) > 18 && *(line+18) == ':')
- 			q = NULL;
- 		else
- 			dalnet = (q == NULL);
-@@ -462,7 +462,7 @@
- 		    else sscanf(p, "%s was %s from %s", for_, fr, temp);
- 
- 		    q = p;
--		    sprintf(q, "%s@%s", fr, temp);
-+		    snprintf(q, strlen(q)+1, "%s@%s", fr, temp);
- 		    if (!conn) 
- 		    {
- 			port = strstr(temp2, "reason:");
-diff -ru BitchX-old/source/server.c BitchX/source/server.c
---- BitchX-old/source/server.c	2002-03-25 07:21:24.000000000 +0200
-+++ BitchX/source/server.c	2003-03-13 20:10:00.000000000 +0200
-@@ -474,11 +474,11 @@
- 					}
- 					else
- #endif
--						junk = dgets(bufptr, des, 1, BIG_BUFFER_SIZE, server_list[i].ssl_fd);
-+						junk = dgets(bufptr, des, 1, BIG_BUFFER_SIZE/2, server_list[i].ssl_fd);
- 				}
- 				else
- #endif
--					junk = dgets(bufptr, des, 1, BIG_BUFFER_SIZE, NULL);
-+					junk = dgets(bufptr, des, 1, BIG_BUFFER_SIZE/2, NULL);
- 			}
- 			switch (junk)
- 			{
-@@ -1741,7 +1741,7 @@
- 			default:
- 				if (FD_ISSET(des, &rd))
- 				{
--					if (!dgets(buffer, des, 0, BIG_BUFFER_SIZE, NULL))
-+					if (!dgets(buffer, des, 0, BIG_BUFFER_SIZE/2, NULL))
- 						flushing = 0;
- 				}
- 				break;
-@@ -1751,7 +1751,7 @@
- 	FD_ZERO(&rd);
- 	FD_SET(des, &rd);
- 	if (new_select(&rd, NULL, &timeout) > 0)
--		dgets(buffer, des, 1, BIG_BUFFER_SIZE, NULL);
-+		dgets(buffer, des, 1, BIG_BUFFER_SIZE/2, NULL);
- }
- 
- 
-
-
diff --git a/net-irc/bitchx/files/digest-bitchx-1.0.19-r5 b/net-irc/bitchx/files/digest-bitchx-1.0.19-r5
deleted file mode 100644
index 8f5a8922eab1..000000000000
--- a/net-irc/bitchx/files/digest-bitchx-1.0.19-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 79431ff0880e7317049045981fac8adc ircii-pana-1.0c19.tar.gz 2533621
-MD5 10a57b14bb58910e1f373fbc1b8b2197 bitchx-1.0.19-cjk.patch 7050
diff --git a/net-irc/bitchx/files/digest-bitchx-1.0.19-r6 b/net-irc/bitchx/files/digest-bitchx-1.0.19-r6
deleted file mode 100644
index 733d621134c6..000000000000
--- a/net-irc/bitchx/files/digest-bitchx-1.0.19-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79431ff0880e7317049045981fac8adc ircii-pana-1.0c19.tar.gz 2533621
diff --git a/net-irc/bitchx/files/digest-bitchx-1.1-r1 b/net-irc/bitchx/files/digest-bitchx-1.1-r1
new file mode 100644
index 000000000000..3967cc2f290d
--- /dev/null
+++ b/net-irc/bitchx/files/digest-bitchx-1.1-r1
@@ -0,0 +1 @@
+MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476