From 0a0cc91b15c5394f3005051b8427fd08a29dcc28 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Nov 2009 23:25:12 +0100
Subject: [PATCH] glibc: update to 2.11.

--HG--
extra : convert_revision : c9be8f1a3888b3321562e1c0b1b4a169d0d1f97d
---
 templates/glibc/devel.template                |  2 -
 templates/glibc/locales.template              |  1 +
 .../patches/glibc-2.10.1-binutils-2.20.patch  | 50 -------------------
 templates/glibc/template                      |  5 +-
 4 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch

diff --git a/templates/glibc/devel.template b/templates/glibc/devel.template
index d93cbc97682..44104915f88 100644
--- a/templates/glibc/devel.template
+++ b/templates/glibc/devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc
 
 do_install()
diff --git a/templates/glibc/locales.template b/templates/glibc/locales.template
index e6e95d74d81..276cd342675 100644
--- a/templates/glibc/locales.template
+++ b/templates/glibc/locales.template
@@ -4,6 +4,7 @@ short_desc="${short_desc} (locales)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
+
 noarch=yes
 
 do_install()
diff --git a/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch b/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch
deleted file mode 100644
index e33c1b2ba17..00000000000
--- a/templates/glibc/patches/glibc-2.10.1-binutils-2.20.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4c14c8c348ee3e9a5fea3608cabcabdb275b6141 Mon Sep 17 00:00:00 2001
-From: H.J. Lu <hongjiu.lu@intel.com>
-Date: Sat, 5 Sep 2009 07:06:19 -0700
-Subject: [PATCH 1/1] Support binutils 2.20.
-
----
- configure    |    4 ++--
- configure.in |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- configure
-+++ configure
-@@ -4839,7 +4839,7 @@ $as_echo_n "checking version of $AS... " >&6; }
-   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|[2-9].[2-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -4902,7 +4902,7 @@ $as_echo_n "checking version of $LD... " >&6; }
-   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]*|[2-9].[2-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-diff --git a/configure.in b/configure.in
-index 4584afe..7c4f71f 100644
---- configure.in
-+++ configure.in
-@@ -897,10 +897,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in
- # Accept binutils 2.13 or newer.
- AC_CHECK_PROG_VER(AS, $AS, --version,
- 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
--		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
-+		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
- AC_CHECK_PROG_VER(LD, $LD, --version,
- 		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
--		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
-+		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
- 
- # We need the physical current working directory.  We cannot use the
- # "pwd -P" shell builtin since that's not portable.  Instead we try to
--- 
-1.6.4
-
diff --git a/templates/glibc/template b/templates/glibc/template
index c6da1f985cf..23bdc7e9e1f 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -1,7 +1,6 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.10.1
-revision=1
+version=2.11
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 build_style=gnu_configure
 configure_script="../configure"
@@ -13,7 +12,7 @@ configure_args="--with-tls -disable-profile --with-__thread
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
+checksum=9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
  and is an important part of what makes up a GNU system.  It provides the