fix multibyte locale being slow, bug #19762

5 files changed, 153 insertions, 4 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 9836dc82936f..16b376d2fc97 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,16 +1,21 @@
 # ChangeLog for app-shells/bash
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.4 2003/03/27 11:24:47 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.5 2003/04/27 11:12:10 azarah Exp $
 
-  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> bash-2.05b-r3.ebuild:
+*bash-2.05b-r4 (27 Apr 2003)
+
+  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> bash-2.05b-r4.ebuild :
+  Readline is slow with multibyte locale, bug #19762.  Add a patch.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> bash-2.05b-r3.ebuild :
   Marked ppc stable
 
 *bash-2.05b-r3 (11 Mar 2003)
 
-  27 Mar 2003; Christian Birchinger <joker@gentoo.org> bash-2.05b-r3.ebuild:
+  27 Mar 2003; Christian Birchinger <joker@gentoo.org> bash-2.05b-r3.ebuild :
   Added stable sparc keyword
 
-  12 Mar 2003; Martin Holzer <mholzer@gentoo.org> bash-2.05b-r3.ebuild:
+  12 Mar 2003; Martin Holzer <mholzer@gentoo.org> bash-2.05b-r3.ebuild :
   removed dodoc man/*.3 (doesn't exist)
 
   11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> bash-2.05a-r3.ebuild,
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
new file mode 100644
index 000000000000..256bb638150a
--- /dev/null
+++ b/app-shells/bash/Manifest
@@ -0,0 +1,9 @@
+MD5 075271589394167e06ca80e7bcb280c8 ChangeLog 3861
+MD5 ba1233983751e50700241a6495306378 bash-2.05a-r3.ebuild 1917
+MD5 31f9be8380509135728cb39c2c0fb8b4 bash-2.05b-r3.ebuild 1759
+MD5 371ccd50539574f1a62d4f5913cbc1f7 bash-2.05b-r4.ebuild 1869
+MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 555c6b4000bd9d5557f5627530e13ec4 files/digest-bash-2.05a-r3 63
+MD5 867b3b11e48acac6d09794c8d36cb204 files/digest-bash-2.05b-r3 296
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 867b3b11e48acac6d09794c8d36cb204 files/digest-bash-2.05b-r4 296
diff --git a/app-shells/bash/bash-2.05b-r4.ebuild b/app-shells/bash/bash-2.05b-r4.ebuild
new file mode 100644
index 000000000000..274e071e3a77
--- /dev/null
+++ b/app-shells/bash/bash-2.05b-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r4.ebuild,v 1.1 2003/04/27 11:12:10 azarah Exp $
+
+inherit eutils flag-o-matic
+
+# Official patches
+PLEVEL="x002 x003 x004"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+SRC_URI="ftp://ftp.gnu.org/gnu/bash/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2
+	${PLEVEL//x/ftp://ftp.gnu.org/gnu/bash/bash-${PV}-patches/bash${PV/\.}-}"
+HOMEPAGE="http://www.gnu.org/software/bash/bash.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+IUSE="nls build"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+	epatch ${DISTDIR}/${P}-gentoo.diff.bz2
+
+	for x in ${PLEVEL//x}
+	do
+		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
+	done
+
+	# Remove autoconf dependency
+	cp Makefile.in Makefile.in.orig
+	sed -e "/&& autoconf/d" Makefile.in.orig > Makefile.in
+
+	# Readline is slow with multibyte locale, bug #19762
+	epatch ${FILESDIR}/${P}-multibyte-locale.patch
+}
+
+src_compile() {
+
+	filter-flags -malign-double
+
+	local myconf=""
+
+	# Always use the buildin readline, else if we update readline
+	# bash gets borked as readline is usually not binary compadible
+	# between minor versions.
+	#
+	# Martin Schlemmer <azarah@gentoo.org> (1 Sep 2002)
+	#use readline && myconf="--with-installed-readline"
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf="${myconf} --disable-nls"
+
+	econf \
+		--disable-profiling \
+		--with-curses \
+		--without-gnu-malloc \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	einstall || die
+
+	dodir /bin
+	mv ${D}/usr/bin/bash ${D}/bin
+	dosym bash /bin/sh
+
+	use build \
+		&& rm -rf ${D}/usr \
+		|| ( \
+			doman doc/*.1
+			dodoc README NEWS AUTHORS CHANGES COMPAT COPYING Y2K
+			dodoc doc/FAQ doc/INTRO
+		)
+}
diff --git a/app-shells/bash/files/bash-2.05b-multibyte-locale.patch b/app-shells/bash/files/bash-2.05b-multibyte-locale.patch
new file mode 100644
index 000000000000..e5f2eb497b09
--- /dev/null
+++ b/app-shells/bash/files/bash-2.05b-multibyte-locale.patch
@@ -0,0 +1,50 @@
+diff -ru bash-2.05b.orig/lib/readline/display.c bash-2.05b/lib/readline/display.c
+--- bash-2.05b.orig/lib/readline/display.c	2002-06-04 23:54:47.000000000 +0900
++++ bash-2.05b/lib/readline/display.c	2002-12-12 16:31:06.000000000 +0900
+@@ -1129,16 +1129,24 @@
+       memset (&ps_new, 0, sizeof(mbstate_t));
+       memset (&ps_old, 0, sizeof(mbstate_t));
+ 
+-      new_offset = old_offset = 0;
+-      for (ofd = old, nfd = new;
+-	   (ofd - old < omax) && *ofd &&
+-	     _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
+-	{
+-	  old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
+-	  new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
+-	  ofd = old + old_offset;
+-	  nfd = new + new_offset;
+-	}
++      if(omax == nmax && strncmp(new,old,omax) == 0)
++        {
++          ofd = old + omax;
++          nfd = new + nmax;
++        }
++      else
++        {
++          new_offset = old_offset = 0;
++          for (ofd = old, nfd = new;
++               (ofd - old < omax) && *ofd &&
++                 _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
++            {
++              old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
++              new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
++              ofd = old + old_offset;
++              nfd = new + new_offset;
++            }
++        }
+     }
+   else
+ #endif
+@@ -1169,8 +1177,9 @@
+ 	  memset (&ps_old, 0, sizeof (mbstate_t));
+ 	  memset (&ps_new, 0, sizeof (mbstate_t));
+ 
+-	  _rl_adjust_point (old, ols - old, &ps_old);
+-	  _rl_adjust_point (new, nls - new, &ps_new);
++          /* these doesn't make sense */
++	  /* _rl_adjust_point (old, ols - old, &ps_old); */
++          /* _rl_adjust_point (new, nls - new, &ps_new); */
+ 
+ 	  if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0)
+ 	    break;
diff --git a/app-shells/bash/files/digest-bash-2.05b-r4 b/app-shells/bash/files/digest-bash-2.05b-r4
new file mode 100644
index 000000000000..9e2103210e00
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-2.05b-r4
@@ -0,0 +1,5 @@
+MD5 5238251b4926d778dfe162f6ce729733 bash-2.05b.tar.gz 1956216
+MD5 acac0949285525a5920d80f2aa4668de bash-2.05b-gentoo.diff.bz2 2744
+MD5 2957bbe5f6db1830d649d1071baba63c bash205b-002 755
+MD5 2828e78563927b806246e2b4806ee0f5 bash205b-003 2356
+MD5 6bf89831209ba6d208943d2ebaa7fe3a bash205b-004 1110