Fix cachecheck to make it work with autoconf-2.60, thanks to flameeyes, bug 138161

Package-Manager: portage-2.1.1_pre1-r3

4 files changed, 38 insertions, 10 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 4c277a601515..83f3f8171fcc 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.47 2006/06/01 23:31:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.48 2006/06/27 09:50:06 genstef Exp $
+
+  27 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/a2ps-4.13-fixcachecheck.patch, a2ps-4.13c-r5.ebuild:
+  Fix cachecheck to make it work with autoconf-2.60, thanks to flameeyes, bug
+  138161
 
 *a2ps-4.13c-r5 (01 Jun 2006)
 
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 902a5f4b4b85..f4c062a660ce 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -2,6 +2,10 @@ AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2
 MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf files/4.13c-gcc34.patch 348
 SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159 files/4.13c-gcc34.patch 348
+AUX a2ps-4.13-fixcachecheck.patch 444 RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 SHA1 64dadd08f018a65e380fd798157ce04af3a8f6b2 SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622
+MD5 6432b1da449b96b531b0843259839236 files/a2ps-4.13-fixcachecheck.patch 444
+RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 files/a2ps-4.13-fixcachecheck.patch 444
+SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622 files/a2ps-4.13-fixcachecheck.patch 444
 AUX a2ps-4.13-select-freebsd.patch 1582 RMD160 3046e537c2447788ada3ce69ae51dac7b3ef0376 SHA1 390bb987b19dba341dbdd05635b917379881d862 SHA256 1ef965e835524b4d45dbe98038817d48ebb0c152d7c2c62c1e3d29f85bb0e2ae
 MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
 RMD160 3046e537c2447788ada3ce69ae51dac7b3ef0376 files/a2ps-4.13-select-freebsd.patch 1582
@@ -52,14 +56,14 @@ EBUILD a2ps-4.13c-r4.ebuild 2298 RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a
 MD5 acbfb7af08033b94a8c5577dfc0f7649 a2ps-4.13c-r4.ebuild 2298
 RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a a2ps-4.13c-r4.ebuild 2298
 SHA256 074cd970c12781553f739d7e77a919dfc9e4c5e76ceabbff726ecca7b2b814b6 a2ps-4.13c-r4.ebuild 2298
-EBUILD a2ps-4.13c-r5.ebuild 2537 RMD160 b81d74773a7dd4cd922404dc3a7dd8605365f12a SHA1 47e2fcecdd36d7c7c7a2b6cacf5b5c293c36526b SHA256 acb9b74e2f6ad85e024050b4de61285175a33003ec33ea531af996a6170986db
-MD5 d940850d2f5c3decbc297c14fd29574b a2ps-4.13c-r5.ebuild 2537
-RMD160 b81d74773a7dd4cd922404dc3a7dd8605365f12a a2ps-4.13c-r5.ebuild 2537
-SHA256 acb9b74e2f6ad85e024050b4de61285175a33003ec33ea531af996a6170986db a2ps-4.13c-r5.ebuild 2537
-MISC ChangeLog 7238 RMD160 4bc8a808ffa77d7e960172113ddde60ccf7d14ae SHA1 e82b773e5a8c68b86cbccc1e517b3a53b433518d SHA256 e496ce51bfef4c26f018e70d6833c3422aba0773481b2f0d92af7737503d6e8e
-MD5 79afbff2032ef733468ed577ce50e8bf ChangeLog 7238
-RMD160 4bc8a808ffa77d7e960172113ddde60ccf7d14ae ChangeLog 7238
-SHA256 e496ce51bfef4c26f018e70d6833c3422aba0773481b2f0d92af7737503d6e8e ChangeLog 7238
+EBUILD a2ps-4.13c-r5.ebuild 2623 RMD160 4abe1d8510ff7d6e5c46992e5f6772b987df4429 SHA1 d77100f627e8297835bd4fb17a8c7412868e10cf SHA256 9214c9bec345d2a4530d325a45cff8e8746ae7324257f625903af0e3c7904e91
+MD5 8edce7ddc94e101e00b121653c60cc59 a2ps-4.13c-r5.ebuild 2623
+RMD160 4abe1d8510ff7d6e5c46992e5f6772b987df4429 a2ps-4.13c-r5.ebuild 2623
+SHA256 9214c9bec345d2a4530d325a45cff8e8746ae7324257f625903af0e3c7904e91 a2ps-4.13c-r5.ebuild 2623
+MISC ChangeLog 7441 RMD160 79a95350cc87c596810106e1304b9dfc597c21d7 SHA1 169fda841a43c02a253087e4f78726575b653bcf SHA256 b88cc54804a61e2996b1b80fbaf434f3b931eb71249ab6fcb8a60b29450aea7d
+MD5 428e7d58a85fda3fe53d0a673587df22 ChangeLog 7441
+RMD160 79a95350cc87c596810106e1304b9dfc597c21d7 ChangeLog 7441
+SHA256 b88cc54804a61e2996b1b80fbaf434f3b931eb71249ab6fcb8a60b29450aea7d ChangeLog 7441
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
 RMD160 1823829273be97b95b286540a3439d152281baf1 metadata.xml 178
diff --git a/app-text/a2ps/a2ps-4.13c-r5.ebuild b/app-text/a2ps/a2ps-4.13c-r5.ebuild
index 519a14714485..0c318a31476d 100644
--- a/app-text/a2ps/a2ps-4.13c-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r5.ebuild,v 1.1 2006/06/01 23:31:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r5.ebuild,v 1.2 2006/06/27 09:50:06 genstef Exp $
 
 inherit gnuconfig eutils autotools
 
@@ -57,6 +57,9 @@ src_unpack() {
 	# fix psset with sed-4.1, bug #126403
 	epatch ${FILESDIR}/a2ps-4.13c-psset.patch
 
+	# fix >=autoconf-2.60, bug 138161
+	epatch ${FILESDIR}/a2ps-4.13-fixcachecheck.patch
+
 	gnuconfig_update || die "gnuconfig_update failed"
 	AT_M4DIR="m4" eautoreconf || die "eautoreconf failed"
 }
diff --git a/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch b/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch
new file mode 100644
index 000000000000..0ecfec53f4ac
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13-fixcachecheck.patch
@@ -0,0 +1,16 @@
+Index: a2ps-4.13/configure.in
+===================================================================
+--- a2ps-4.13.orig/configure.in
++++ a2ps-4.13/configure.in
+@@ -158,8 +158,9 @@ if test $ac_cv_func_fnmatch_works = no; 
+ fi
+ 
+ # Check for C99 va_copy
+-AC_CACHE_CHECK([
+-  AC_TRY_LINK([#include <stdarg.h>],
++AC_CACHE_CHECK([if compiler supports C99 va_copy],
++  [ac_cv_va_copy],
++  [AC_TRY_LINK([#include <stdarg.h>],
+    [
+ 	va_list va1, va2;
+