From 51b8260d609f0b8937a34ab12e21d5d3f95f4331 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Sun, 28 Mar 2004 15:45:58 +0000 Subject: New release, closes #45974. --- net-irc/bitchx/ChangeLog | 9 +- net-irc/bitchx/Manifest | 11 +- net-irc/bitchx/bitchx-1.1.ebuild | 125 +++++++++++ net-irc/bitchx/files/1.1/bitchx-1.1-cjk.patch | 243 +++++++++++++++++++++ net-irc/bitchx/files/1.1/bitchx-1.1-freenode.patch | 31 +++ net-irc/bitchx/files/1.1/bitchx-1.1-hebrew.patch | 11 + net-irc/bitchx/files/digest-bitchx-1.1 | 1 + 7 files changed, 427 insertions(+), 4 deletions(-) create mode 100644 net-irc/bitchx/bitchx-1.1.ebuild create mode 100644 net-irc/bitchx/files/1.1/bitchx-1.1-cjk.patch create mode 100644 net-irc/bitchx/files/1.1/bitchx-1.1-freenode.patch create mode 100644 net-irc/bitchx/files/1.1/bitchx-1.1-hebrew.patch create mode 100644 net-irc/bitchx/files/digest-bitchx-1.1 (limited to 'net-irc') diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog index 50f003ae50ef..f8f72e6f78c7 100644 --- a/net-irc/bitchx/ChangeLog +++ b/net-irc/bitchx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/bitchx # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.33 2004/03/28 14:14:16 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.34 2004/03/28 15:45:58 zul Exp $ + +*bitchx-1.1 (28 Mar 2004) + + 28 Mar 2004; bitchx-1.1.ebuild, + files/1.1/bitchx-1.1-cjk.patch, files/1.1/bitchx-1.1-freenode.patch, + files/1.1/bitchx-1.1-hebrew.patch: + New release, closes #45974. 28 Mar 2004; Chuck Short bitchx-1.0.19-r5.ebuild, bitchx-1.0.19-r6.ebuild: diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest index a615ae8d97c8..e4ed3b1a0056 100644 --- a/net-irc/bitchx/Manifest +++ b/net-irc/bitchx/Manifest @@ -1,6 +1,7 @@ -MD5 245d34d37b984cab2d313504379c4eb3 bitchx-1.0.19-r6.ebuild 3397 -MD5 5a864c0c2742822823aa780eb8d9ea83 ChangeLog 5503 -MD5 ccd60d8d11300a18416a15b25603eaef bitchx-1.0.19-r5.ebuild 3509 +MD5 247faaba564ba84dcc2f75f500392a8a bitchx-1.1.ebuild 3245 +MD5 ec8c2c6709a5b2ee4d171d2e9309605b bitchx-1.0.19-r6.ebuild 3401 +MD5 8a3769fc1b24b6261b820771b4b63b3e ChangeLog 5891 +MD5 9322c47d542b6c0cc162fcb9a65e320b bitchx-1.0.19-r5.ebuild 3513 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 @@ -11,3 +12,7 @@ MD5 d37e1625d80fafd8d98655472b706214 files/bitchx-1.0.19-freenode.patch 917 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 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477 +MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976 +MD5 10a57b14bb58910e1f373fbc1b8b2197 files/1.1/bitchx-1.1-cjk.patch 7050 diff --git a/net-irc/bitchx/bitchx-1.1.ebuild b/net-irc/bitchx/bitchx-1.1.ebuild new file mode 100644 index 000000000000..52005cd064ea --- /dev/null +++ b/net-irc/bitchx/bitchx-1.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1.ebuild,v 1.1 2004/03/28 15:45:58 zul Exp $ + +inherit flag-o-matic eutils + +MY_P=ircii-pana-${PV}-final +S=${WORKDIR}/BitchX +DESCRIPTION="An IRC Client" +HOMEPAGE="http://www.bitchx.com/" +SRC_URI="ftp://ftp.bitchx.com/pub/BitchX/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha" +IUSE="ssl esd gnome xmms ipv6 gtk cjk" + +DEPEND=">=sys-libs/ncurses-5.1 + ssl? ( >=dev-libs/openssl-0.9.6 ) + xmms? ( media-sound/xmms ) + ncurses? ( sys-libs/ncurses ) + 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}/${PV}/${P}-cjk.patch + epatch ${FILESDIR}/${PV}/${P}-hebrew.patch + epatch ${FILESDIR}/${PV}/${P}-freenode.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" + replace-flags -O[3-9] -O2 + + local myconf + + if [ "${DEBUG}" ] + then + einfo "debugging" + myconf="${myconf} --enable-debug" + fi + + use esd && use gtk \ + && myconf="${myconf} --enable-sound" \ + || myconf="${myconf} --disable-sound" + + use gtk && use gnome\ + && myconf="${myconf} --with-gtk" \ + || myconf="${myconf} --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" + + 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 + ) && append-flags -I/usr/include/gnome-1.0 + + econf \ + CFLAGS="${CFLAGS}" \ + --enable-cdrom \ + --with-plugins \ + `use_with ssl` \ + `use_enable ipv6` \ + ${myconf} || die + emake || die + cd contrib && make vh1 +} + +src_install () { + einstall || die + [ -f contrib/vh1 ] && cp contrib/vh1 ${D}/usr/bin/ + 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.1-final /usr/bin/gtkBitchX + einfo "Installed gtkBitchX" + ) || dosym BitchX-1.1-final /usr/bin/BitchX + + fperms a-x /usr/lib/bx/plugins/BitchX.hints + + cd ${S} + dodoc Changelog README* IPv6-support + 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 + 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-cjk.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-cjk.patch new file mode 100644 index 000000000000..2468784a5a54 --- /dev/null +++ b/net-irc/bitchx/files/1.1/bitchx-1.1-cjk.patch @@ -0,0 +1,243 @@ +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/1.1/bitchx-1.1-freenode.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-freenode.patch new file mode 100644 index 000000000000..adeefbca1b29 --- /dev/null +++ b/net-irc/bitchx/files/1.1/bitchx-1.1-freenode.patch @@ -0,0 +1,31 @@ +diff -Naur BitchX/include/config.h BitchX-gentoo/include/config.h +--- BitchX/include/config.h 2003-07-26 07:00:32.000000000 +0000 ++++ BitchX-gentoo/include/config.h 2004-03-28 11:12:26.000000000 +0000 +@@ -37,7 +37,26 @@ + * + * 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 "\ ++ "orwell.freenode.net "\ ++ "leguin.freenode.net "\ ++ "kornbluth.freenode.net "\ ++ "jordan.freenode.net "\ ++ "herbert.freenoe.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.foxlink.net "\ + "irc.weblook2k.com "\ + "irc.wh.verio.net "\ diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-hebrew.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-hebrew.patch new file mode 100644 index 000000000000..d37c2fc574e1 --- /dev/null +++ b/net-irc/bitchx/files/1.1/bitchx-1.1-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 diff --git a/net-irc/bitchx/files/digest-bitchx-1.1 b/net-irc/bitchx/files/digest-bitchx-1.1 new file mode 100644 index 000000000000..3967cc2f290d --- /dev/null +++ b/net-irc/bitchx/files/digest-bitchx-1.1 @@ -0,0 +1 @@ +MD5 611d2dda222f00c10140236f4c331572 ircii-pana-1.1-final.tar.gz 2532476 -- cgit v1.2.3-65-gdbad