Use upstream patch instead.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 27 insertions, 27 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 5e4601851230..05d054146786 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.74 2010/03/19 19:09:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.75 2010/03/20 18:21:51 ssuominen Exp $
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/zlib-1.2.4-configure-LANG.patch:
+  Use upstream patch instead.
 
   19 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> zlib-1.2.4.ebuild,
   +files/zlib-1.2.4-configure-LANG.patch:
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 50fb67d53ff3..fd5d7cf2f96b 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -9,11 +9,11 @@ AUX zlib-1.2.3-r1-bsd-soname.patch 572 RMD160 40351d687838d4889ee1cb47aa594f0f9b
 AUX zlib-1.2.3-visibility-support.patch 1016 RMD160 39492a1537bad731fd568a0af0ad39e93ceb3a07 SHA1 326e03782ed533a480115b9bcd5e96773f7570df SHA256 77acaffa3dccf2d48cfde0f9a30d10a55b4d9aad7c9c3b51c50925b6dadc8df6
 AUX zlib-1.2.4-LDFLAGS.patch 1352 RMD160 e7679bcc555d9a7257f762efc4f9c24279ee8f11 SHA1 7f3171578fb975cfc496c9d65665d1d9b55b2278 SHA256 ba9414f01d9e130bda5967bf42286cbc8c8f6cd5b123edee1e349ce774bff2d5
 AUX zlib-1.2.4-build.patch 493 RMD160 ddde6573caeff6ef99081737d930b5acb5499a8b SHA1 41bea630448dd0a837339c78ddcd94c1bb41d575 SHA256 8ac2727670ddb58cfb4d254b74df8879dd1c9195668138615f1f99fc87ad4501
-AUX zlib-1.2.4-configure-LANG.patch 722 RMD160 c7cc57dbc175248b3c426632d5700a029774eeeb SHA1 8ad1646956104fa12de2d89bfd201e2ea1e1b81c SHA256 4eb580c6d59ffd47326cd34b8fb99d5d71d22b708a382bc6a86b2a31a8602132
+AUX zlib-1.2.4-configure-LANG.patch 1266 RMD160 57bb24a87be422dad02abcee83f3d8c58c8c8ccb SHA1 e63d2da9673a5cf5f2d74fb4244a579474a6b2b9 SHA256 57e562ee16030f83cbfbfaf5e493176c85162bff64e3173301a99b4c8dfbf6c8
 AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029bc59c0198880 SHA1 ff8e8351e1c7ac97522c523009e1800c5738537c SHA256 395080c33279993fcaf7f78d60a0460349b313d07d122ea8817419185fd08ad2
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 DIST zlib-1.2.4.tar.bz2 483564 RMD160 8f0f17e33e36fa1427f8186b6d12cf5b2240294a SHA1 8cf10521c1927daa5e12efc5e1725a0d70e579f3 SHA256 d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc
 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde
 EBUILD zlib-1.2.4.ebuild 1699 RMD160 5695f696ea12fe4be5ac86ce30dd9bca546a6222 SHA1 e37dc5dbe003e8b2abd0a52ca1f167aab6350eeb SHA256 e4cf513afc6cb0b212e47046f8b6dffd3fed148248f797308cff6622f3147aa3
-MISC ChangeLog 10478 RMD160 d051d5575512be670355d34d3f51af312ef8932d SHA1 3aabca00105042d09cd151386f2a09d3283e5229 SHA256 5a7614065b35fd5e9305ba45f0cb294d5e2042c31abba3cb03ff7c62c190f95f
+MISC ChangeLog 10604 RMD160 889d9bc1324f4da4116c5938e0cf4eb262165f08 SHA1 dfdd052130ab06b202399073b8e804de4a456f26 SHA256 adab68628a1933ddd568ce16632cbe8eefb0343c171ff827e0ff688d2c4a2413
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
index 542612a1371a..b1c280665325 100644
--- a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
+++ b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
@@ -1,24 +1,20 @@
-http://bugs.gentoo.org/show_bug.cgi?id=310225
-
---- configure
-+++ configure
-@@ -9,6 +9,19 @@
- # or for csh/tcsh users:
- #    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Incorrect settings of CC or CFLAGS may prevent creating a shared library.
- # If you have problems, try without defining CC and CFLAGS before reporting
- # an error.
+diff -ur zlib-1.2.4.orig/configure zlib-1.2.4/configure
+--- zlib-1.2.4.orig/configure	2010-03-12 17:06:14.000000000 +0200
++++ zlib-1.2.4/configure	2010-03-20 19:25:26.000000000 +0200
+@@ -43,11 +43,11 @@
+       echo '  configure [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]'
+       echo '    [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
+         exit 0 ;;
+-    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
+-    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
+-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
+-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
+-    -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
++    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
++    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
++    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
++    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
++    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
+     -p* | --prefix) prefix="$2"; shift; shift ;;
+     -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
+     -l* | --libdir) libdir="$2"; shift; shift ;;