update sed locale patch

Package-Manager: portage-2.0.51-r15

3 files changed, 64 insertions, 9 deletions

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index b8cbb4c96a79..1a37492adfbe 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,8 +1,9 @@
 MD5 d39b0d8aa4e08d73b178734d3268dbd4 ChangeLog 9484
-MD5 265e424aab7cff43621724982f8e738a e2fsprogs-1.36.ebuild 3242
+MD5 54432110b1e54ba458f618f72d355216 e2fsprogs-1.36.ebuild 3400
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 37cb0ccd95b17f3838109fb5c07bdd5c e2fsprogs-1.35-r1.ebuild 3377
 MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36 67
+MD5 4a7d54ccac4002d10462c40660712a72 files/e2fsprogs-1.36-sed-locale.patch 2142
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
 MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
 MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
index 5d63be2f8aa0..dc208954a8e0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild,v 1.1 2005/02/06 21:57:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.36.ebuild,v 1.2 2005/02/06 23:17:08 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -21,13 +21,15 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 	# Fix a cosmetic error in mk_cmds's help output.
-	cd ${S}; epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	# Patch to make the configure and sed scripts more friendly to, 
+	# for example, the Estonian locale
+	epatch ${FILESDIR}/${P}-sed-locale.patch
 	# Userpriv fix. Closes #27348
 	chmod u+w po/*.po
 
-	gnuconfig_update
-
 	# Use -fPIC compiled shared files in .a files. Fix kdelibs-3.3.0 compilation on hppa.
 	use static || sed -e '/ARUPD/s:$(OBJS):elfshared/*.o:' -i ${S}/lib/Makefile.library
 
@@ -37,16 +39,17 @@ src_unpack() {
 		configure e2fsck/journal.c e2fsck/recovery.c \
 		e2fsck/unix.c lib/ext2fs/kernel-jbd.h \
 		|| die "sed jbd debug failed"
-}
 
-src_compile() {
 	# building e2fsprogs on sparc results in silo breaking
-	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
+	[[ ${ARCH} == "sparc" ]] && filter-flags -fstack-protector
 
+	# Keep the package from doing silly things
 	export LDCONFIG=/bin/true
 	export CC=$(tc-getCC)
 	export STRIP=/bin/true
+}
 
+src_compile() {
 	local myconf
 	use static \
 		&& myconf="${myconf} --with-ldopts=-static" \
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.36-sed-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.36-sed-locale.patch
new file mode 100644
index 000000000000..1ba295d6aac3
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.36-sed-locale.patch
@@ -0,0 +1,51 @@
+diff -ur e2fsprogs-1.36.orig/config/config.rpath e2fsprogs-1.36/config/config.rpath
+--- e2fsprogs-1.36.orig/config/config.rpath	2005-02-06 18:02:17.000000000 -0500
++++ e2fsprogs-1.36/config/config.rpath	2005-02-06 18:04:13.000000000 -0500
+@@ -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 -ur e2fsprogs-1.36.orig/configure e2fsprogs-1.36/configure
+--- e2fsprogs-1.36.orig/configure	2005-02-06 18:02:17.000000000 -0500
++++ e2fsprogs-1.36/configure	2005-02-06 18:04:07.000000000 -0500
+@@ -1256,7 +1256,7 @@
+ # value.
+ ac_cache_corrupted=false
+ for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++	       sed -n 's/^ac_env_\([[:alnum:]_]*\)_set=.*/\1/p'`; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+@@ -7487,7 +7487,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'`
+@@ -15068,7 +15068,7 @@
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++  /@[[:alpha:]_][[:alnum:]_]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+       if test -z "$ac_sed_cmds"; then
+ 	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       else
+@@ -15258,7 +15258,7 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++/@[[:alpha:]_][[:alnum:]_]*@/!b
+ s,@configure_input@,$configure_input,;t t
+ s,@srcdir@,$ac_srcdir,;t t
+ s,@abs_srcdir@,$ac_abs_srcdir,;t t