Added patch to make the sed expressions used in the configure script and other sed scripts friendly to locales like ee_ET (estonian)

4 files changed, 186 insertions, 6 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index a143f85a7699..feb451ba303c 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.10 2003/12/29 04:02:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.11 2003/12/30 09:46:43 seemant Exp $
+
+  30 Dec 2003; Seemant Kulleen <seemant@gentoo.org> e2fsprogs-1.34.ebuild,
+  files/e2fsprogs-sed-locale.patch:
+  Added patch to make the sed expressions used in the configure script and other
+  sed scripts friendly to locales like ee_ET (estonian)
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.34.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 970e5758a5ac..a0aeaa5639f0 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,13 +1,12 @@
 MD5 eb01e246e04dd6b7a3f412a831e1f2bf e2fsprogs-1.33.ebuild 2515
-MD5 eb3eb2d088e2cff27c0d0fe7dad41e5a e2fsprogs-1.34-r1.ebuild 2722
 MD5 8ef73e3fdb521aeb05e01a6d63624277 e2fsprogs-1.32-r2.ebuild 2331
-MD5 49417a4f9409c4ae33ad4d68d0b1970b ChangeLog 5350
+MD5 6191d3b2c042b53b7f69a797e45ada72 e2fsprogs-1.34.ebuild 2809
+MD5 9834f1b395b6a35d8e79d9c1e15efc3a ChangeLog 5601
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 245d5b7141e6d36e84fa830a7ae41262 files/eeet.patch 4286
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
 MD5 3307c0c209b26bf447ff2840b7118862 files/digest-e2fsprogs-1.33 67
 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
 MD5 46ff23c57e090a64063ab99cc5bea0e2 files/e2fsprogs-1.34-kernel-2.6-fix.patch 738
 MD5 0b77829b4c6500ac9722143384ddda95 files/e2fsprogs-1.27ea-0.8.21.diff 15214
 MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67
-MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
index 0d0d5f04c54b..7c531e2216c6 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.12 2003/12/29 04:02:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.13 2003/12/30 09:46:43 seemant Exp $
 
 inherit eutils
 
@@ -31,6 +31,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-kernel-2.6-fix.patch
 	# Userpriv fix. Closes #27348
 	chmod u+w po/*.po
+	# Patch to make the configure and sed scripts more friendly to, 
+	# for example, the Estonian locale
+	epatch ${FILESDIR}/${PN}-sed-locale.patch
 }
 
 src_compile() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-sed-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-sed-locale.patch
new file mode 100644
index 000000000000..8a9265b95f64
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-sed-locale.patch
@@ -0,0 +1,173 @@
+diff -urN e2fsprogs-1.34.orig/config.rpath e2fsprogs-1.34/config.rpath
+--- e2fsprogs-1.34.orig/config.rpath	2003-07-23 05:57:24.000000000 -0700
++++ e2fsprogs-1.34/config.rpath	2003-12-30 01:24:38.000000000 -0800
+@@ -478,7 +478,7 @@
+ escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+ escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+ 
+-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
++sed -e 's/^\([[:alnum:]_]*\)=/acl_cv_\1=/' <<EOF
+ 
+ # How to pass a linker flag through the compiler.
+ wl="$escaped_wl"
+diff -urN e2fsprogs-1.34.orig/configure e2fsprogs-1.34/configure
+--- e2fsprogs-1.34.orig/configure	2003-07-23 06:07:31.000000000 -0700
++++ e2fsprogs-1.34/configure	2003-12-30 01:21:32.000000000 -0800
+@@ -133,7 +133,7 @@
+   fi
+ 
+   case "$ac_option" in
+-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_[:alnum:]]*=//'` ;;
+   *) ac_optarg= ;;
+   esac
+ 
+@@ -167,7 +167,7 @@
+   -disable-* | --disable-*)
+     ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
++    if test -n "`echo $ac_feature| sed 's/[-[:alnum:]_]//g'`"; then
+       { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+     fi
+     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+@@ -176,7 +176,7 @@
+   -enable-* | --enable-*)
+     ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
++    if test -n "`echo $ac_feature| sed 's/[-_[:alnum:]]//g'`"; then
+       { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+     fi
+     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+@@ -407,7 +407,7 @@
+   -with-* | --with-*)
+     ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
++    if test -n "`echo $ac_package| sed 's/[-_[:alnum:]]//g'`"; then
+       { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+     fi
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+@@ -420,7 +420,7 @@
+   -without-* | --without-*)
+     ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
++    if test -n "`echo $ac_package| sed 's/[-[:alnum:]_]//g'`"; then
+       { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+     fi
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+@@ -448,7 +448,7 @@
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++    if test -n "`echo $ac_option| sed 's/[-[:lower:][:digit:].]//g'`"; then
+       echo "configure: warning: $ac_option: invalid host type" 1>&2
+     fi
+     if test "x$nonopt" != xNONE; then
+@@ -610,7 +610,7 @@
+   esac
+   case $ac_prog in
+     # Accept absolute paths.
+-    [\\/]* | [A-Za-z]:[\\/]*)
++    [\\/]* | [[:alpha:]]:[\\/]*)
+       re_direlt='/[^/][^/]*/\.\./'
+       # Canonicalize the path of ld
+       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+@@ -2198,7 +2198,7 @@
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  egrep "(^|[^[:alpha:]_[:digit:]])off_t[^[:alpha:]_[:digit:]]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_off_t=yes
+ else
+@@ -2231,7 +2231,7 @@
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  egrep "(^|[^[:alpha:]_[:digit:]])size_t[^[:alpha:]_[:digit:]]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_size_t=yes
+ else
+@@ -6204,11 +6204,11 @@
+     # turns \\\\ into \\, and sed turns \\ into \).
+     sed -n \
+       -e "s/'/'\\\\''/g" \
+-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++      -e "s/^\\([[:alnum:]_]*_cv_[[:alnum:]_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+     ;;
+   *)
+     # `set' quotes correctly as required by POSIX, so do not add quotes.
+-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    sed -n -e 's/^\([[:alnum:]_]*_cv_[[:alnum:]_]*\)=\(.*\)/\1=${\1=\2}/p'
+     ;;
+   esac >> confcache
+ if cmp -s $cache_file confcache; then
+@@ -6242,7 +6242,7 @@
+ # Protect against shell expansion while executing Makefile rules.
+ # Protect against Makefile macro expansion.
+ cat > conftest.defs <<\EOF
+-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
++s%#define \([[:alpha:]_][[:alnum:]_]*\) *\(.*\)%-D\1=\2%g
+ s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+ s%\[%\\&%g
+ s%\]%\\&%g
+diff -urN e2fsprogs-1.34.orig/lib/ss/ct_c.sed e2fsprogs-1.34/lib/ss/ct_c.sed
+--- e2fsprogs-1.34.orig/lib/ss/ct_c.sed	2002-02-02 22:03:43.000000000 -0800
++++ e2fsprogs-1.34/lib/ss/ct_c.sed	2003-12-30 01:23:55.000000000 -0800
+@@ -44,7 +44,7 @@
+ # Now we take care of some syntatic sugar.....
+ #
+ /^unimplemented/ {
+-	s/^unimplemented [A-Za-z_0-9]*/request ss_unimplemented/
++	s/^unimplemented [[:alpha:]_[:digit:]]*/request ss_unimplemented/
+ 	s/;/, (dont_list, dont_summarize);/
+ }
+ /^unknown/ {
+@@ -93,9 +93,9 @@
+ 	x
+ 	b EMITHLP
+ }
+-s/[^a-zA-Z0-9].*//
++s/[^[:alnum:]].*//
+ x
+-s/[a-zA-Z0-9]*, *//
++s/[[:alnum:]]*, *//
+ x
+ :EMITHLP
+ s/^/hlp: /
+@@ -114,9 +114,9 @@
+ 	x
+ 	b EMITREQ
+ }
+-s/[^A-Za-z_0-9].*//
++s/[^[:alpha:]_[:digit:]].*//
+ x
+-s/[A-Za-z_0-9]*//
++s/[[:alpha:]_[:digit:]]*//
+ s/, *//
+ x
+ :EMITREQ
+@@ -132,14 +132,14 @@
+ h
+ : OPTLIST
+ /^)/ b EOR
+-/^[^A-Za-z_0-9]/ {
++/^[^[:alpha:]_[:digit:]]/ {
+ 	=
+ 	c\
+ ERROR: parse error in options list
+ }
+-s/[^A-Za-z_0-9].*//
++s/[^[:alpha:]_[:digit:]].*//
+ x
+-s/[A-Za-z_0-9]*//
++s/[[:alpha:]_[:digit:]]*//
+ s/, *//
+ x
+ s/^/opt: /