Update mktime test #220040.

Package-Manager: portage-2.2_pre5

4 files changed, 60 insertions, 7 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 09be67287d50..7ed6674f9e6c 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.116 2008/05/05 04:43:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.117 2008/05/05 05:54:00 vapier Exp $
+
+  05 May 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/autoconf-mktime-2.61.patch, gawk-3.1.6.ebuild:
+  Update mktime test #220040.
 
 *gawk-3.1.6 (05 May 2008)
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index b37916ba0837..b6c530d4f727 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX autoconf-mktime-2.61.patch 1116 RMD160 516f7e7e92f0078726a0f48914fd686587b6a510 SHA1 f0ee67b2647b153c8de7823beeb24a0bb95f2c8f SHA256 e62bc5c6d3fa056be28d6928186998eba7e1850f29f089f707a6dbdb195dee33
 AUX filefuncs/Makefile 1212 RMD160 7b94f136f4a1e5cbfeade53c952c353378584c22 SHA1 e23965d28e8ae856b20211faedaca22cee613c11 SHA256 954bc6e837240b8d756cf6bd1460a24cae2a1cc5c738daf53746a0cff23791a1
 AUX filefuncs/filefuncs.c 10992 RMD160 326a54ea0cc42c819d44cf2a749cb141388c4ef0 SHA1 e31aa18db51077d6dc8aeaf979ecb02471f9175a SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309
 AUX gawk-3.1.3-getpgrp_void.patch 1225 RMD160 ea06ae87acd4d8df1a9a7c160c00b2d13d3ab564 SHA1 427caed0827f2c694fc230fab1b6b993210da6fb SHA256 2e43682e4c86e6f50eeca42b3fc333c1c9c080838b29f3020c88f1d95dc02767
@@ -20,13 +21,13 @@ AUX gawk-3.1.5-wconcat.patch 495 RMD160 29f5eea5b300d8efc482e960b257292e5e5b19f8
 DIST gawk-3.1.5.tar.gz 2310919 RMD160 8d875f4ea9e9ef5c932468cf43c691f6e082b197 SHA1 6cb385b4bc33780a5a4288b787523cbd4a30a900 SHA256 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8
 DIST gawk-3.1.6.tar.bz2 1861630 RMD160 e2639935d87d5c9fdb115a58ab1f598b69a76216 SHA1 fb45bded207af6a8e46cd63fcbb6fb064ecee607 SHA256 513fdd5a0bd1b467bd4993eb3adb4690f65fff6857c9e2ed1a3e46d72151cb6c
 EBUILD gawk-3.1.5-r5.ebuild 3678 RMD160 c7d94892fea66f8ced063f86842c78178165f63e SHA1 8ff21949e2366ce420c24fbc23d5a3dc78b1bb60 SHA256 f415f11c164d0be1a332729f6aa1664b9899cd5a648273cb8a618e1c05335156
-EBUILD gawk-3.1.6.ebuild 3085 RMD160 1115050291363ba8efc5ca5cf7d1ddf7d632e948 SHA1 133e0dd3fbef225210a6fd17a6aa2e653a628910 SHA256 4aa96fc88c6db647da60fa38bdd76708366e6ed1bea69eb16302972da13057dd
-MISC ChangeLog 16524 RMD160 9d3a4d36cca5e4f22319c707bd2e83f28056fc48 SHA1 b87e0a4ca1d4af42d7468bf2dcb52c46abe1c7d8 SHA256 4f05a545809759916da2dc9b61a57c4fe5fd46b7445fc3363978caf6b6667e59
+EBUILD gawk-3.1.6.ebuild 3142 RMD160 c5de98b69064d1f256477dec85c18db3eebf4684 SHA1 9303982ec2df5515c0f56973413a23c02384d1d9 SHA256 d176662d7b5bbd2f1593f3c9c36bd00ecdc93efd72600487888e2b7b1b71d20f
+MISC ChangeLog 16661 RMD160 e33b34c6cb19ba73bf81c0a692bddbb9076babd7 SHA1 8b1a5d4db7305b96d3d1c0bda0363875dd080140 SHA256 293c15ed52d06530d91c641f118bb08803bd49b2c6b90e03ac61cf71c7844f29
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIHpCMj9hvisErhMIRApfxAKDEQigFoXbjhB31f2QSYrQ4ogcTCACfeqIR
-V8P43sfQ1RysPFejI/Lsnxw=
-=uJo5
+iD8DBQFIHqD+j9hvisErhMIRAp99AKCQ9nWji7myksxgLoHXPQv4h+i2AwCeL+4e
+JJdM24gy1NJY3dSt31eEXdM=
+=y1RK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/autoconf-mktime-2.61.patch b/sys-apps/gawk/files/autoconf-mktime-2.61.patch
new file mode 100644
index 000000000000..345169f9a5b5
--- /dev/null
+++ b/sys-apps/gawk/files/autoconf-mktime-2.61.patch
@@ -0,0 +1,47 @@
+--- configure
++++ configure
+@@ -10518,6 +10791,7 @@
+ # endif
+ #endif
+ 
++#include <limits.h>
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_UNISTD_H
+@@ -10666,12 +10940,15 @@
+      isn't worth using anyway.  */
+   alarm (60);
+ 
+-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+-    continue;
+-  time_t_max--;
+-  if ((time_t) -1 < 0)
+-    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+-      continue;
++  for (;;)
++    {
++      t = (time_t_max << 1) + 1;
++      if (t <= time_t_max)
++	break;
++      time_t_max = t;
++    }
++  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+   delta = time_t_max / 997; /* a suitable prime number */
+   for (i = 0; i < N_STRINGS; i++)
+     {
+@@ -10686,10 +10963,12 @@
+ 	     && mktime_test ((time_t) (60 * 60 * 24))))
+ 	return 1;
+ 
+-      for (j = 1; 0 < j; j *= 2)
++      for (j = 1; ; j <<= 1)
+ 	if (! bigtime_test (j))
+ 	  return 1;
+-      if (! bigtime_test (j - 1))
++	else if (INT_MAX / 2 < j)
++	  break;
++      if (! bigtime_test (INT_MAX))
+ 	return 1;
+     }
+   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
diff --git a/sys-apps/gawk/gawk-3.1.6.ebuild b/sys-apps/gawk/gawk-3.1.6.ebuild
index cb49ee08ecb9..ec576e6dcbbd 100644
--- a/sys-apps/gawk/gawk-3.1.6.ebuild
+++ b/sys-apps/gawk/gawk-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.1 2008/05/05 04:43:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.2 2008/05/05 05:54:00 vapier Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -26,6 +26,7 @@ src_unpack() {
 	cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
 
 	cd "${S}"
+	epatch "${FILESDIR}"/autoconf-mktime-2.61.patch #220040
 	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch
 }