Added patch that allows to compile on systems with broken fnmatch function (like with uClibc). Fixes bug #134546.

Package-Manager: portage-2.1_rc3-r2

6 files changed, 128 insertions, 11 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 1c797266d35e..18edf3d680a5 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.45 2006/02/17 01:41:30 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.46 2006/05/30 20:50:04 yvasilev Exp $
+
+  30 May 2006; <yvasilev@gentoo.org>
+  +files/a2ps-4.13c-fnmatch-replacement.patch, a2ps-4.13c-r4.ebuild:
+  Added patch that allows to compile on systems with broken fnmatch function
+  (like with uClibc). Fixes bug #134546.
 
   17 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> a2ps-4.13c-r2.ebuild,
   a2ps-4.13c-r3.ebuild, a2ps-4.13c-r4.ebuild:
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index b4ddb75aa7ba..be9d3fcf539f 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,15 +1,73 @@
-MD5 3e5b9edb7f8cfdb59d03c7d9afaafc34 ChangeLog 6749
-MD5 58fd23bdb425dcdb8a969966f4cd8f01 a2ps-4.13c-r2.ebuild 2052
-MD5 22fbebb3ab4461a9dc9ecb68e242fa07 a2ps-4.13c-r3.ebuild 2120
-MD5 7f93a17c645420994a2272e906b26923 a2ps-4.13c-r4.ebuild 2208
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 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-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
+SHA256 1ef965e835524b4d45dbe98038817d48ebb0c152d7c2c62c1e3d29f85bb0e2ae files/a2ps-4.13-select-freebsd.patch 1582
+AUX a2ps-4.13-stdout.diff 462 RMD160 88b8723f90f4993495f084a3ce475f575fca99c5 SHA1 b5096ae375c7da3436df957d91accedb5aeca972 SHA256 bde80a714f5de1221ec828cf0f33859561510190e97b08f4ba62ab41ad26fc74
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
+RMD160 88b8723f90f4993495f084a3ce475f575fca99c5 files/a2ps-4.13-stdout.diff 462
+SHA256 bde80a714f5de1221ec828cf0f33859561510190e97b08f4ba62ab41ad26fc74 files/a2ps-4.13-stdout.diff 462
+AUX a2ps-4.13c-fixps.patch 549 RMD160 b97b413747ddcb415e3de2a75e1e723bc817b076 SHA1 dd66cf062839d68966a6b719714d78d8702c5462 SHA256 ac32464a1a9bb2f4f557a3567a94928e4d8cbdd20ebaee0e1811f076d7e7456e
 MD5 df6bc895cc6fb0fd47f22fd1c36d1ed3 files/a2ps-4.13c-fixps.patch 549
+RMD160 b97b413747ddcb415e3de2a75e1e723bc817b076 files/a2ps-4.13c-fixps.patch 549
+SHA256 ac32464a1a9bb2f4f557a3567a94928e4d8cbdd20ebaee0e1811f076d7e7456e files/a2ps-4.13c-fixps.patch 549
+AUX a2ps-4.13c-fnmatch-replacement.patch 1500 RMD160 b52b361e3cd532b714b112b7625dfe1a02d090da SHA1 8783952d3410d8d59ed953e1db45e2ef1a0b8f65 SHA256 5d1b8a8791fa2a36c23f43ef153a724cce1f8eec8fb92ab886f52fae7f8f3be3
+MD5 93011b58e9f20a7fafa31287a51884a4 files/a2ps-4.13c-fnmatch-replacement.patch 1500
+RMD160 b52b361e3cd532b714b112b7625dfe1a02d090da files/a2ps-4.13c-fnmatch-replacement.patch 1500
+SHA256 5d1b8a8791fa2a36c23f43ef153a724cce1f8eec8fb92ab886f52fae7f8f3be3 files/a2ps-4.13c-fnmatch-replacement.patch 1500
+AUX a2ps-4.13c-locale-gentoo.diff 981 RMD160 f7366bf6eba344e88c9e7179ddda3fdb9b1f24e4 SHA1 06acfe8ab91e39bdacbe23a71b27a291ef40eaed SHA256 2878415235a2d23231e4295fba1adf0435ddcc539394f7ebe49cf23fdf76ec29
 MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
+RMD160 f7366bf6eba344e88c9e7179ddda3fdb9b1f24e4 files/a2ps-4.13c-locale-gentoo.diff 981
+SHA256 2878415235a2d23231e4295fba1adf0435ddcc539394f7ebe49cf23fdf76ec29 files/a2ps-4.13c-locale-gentoo.diff 981
+AUX a2ps-4.13c-psmandup.diff 569 RMD160 8c9436d9b72a1a2e78f8325c53e1e36bc29e2fbe SHA1 8407ed69c5f787db3149825a1f60fd5ae5a8d434 SHA256 2e64be23e030ed0f08b243f0513800336d06739fc7e347a09c130958531b85cd
 MD5 d68d0bfab547ef1ce70576c7a5570f13 files/a2ps-4.13c-psmandup.diff 569
+RMD160 8c9436d9b72a1a2e78f8325c53e1e36bc29e2fbe files/a2ps-4.13c-psmandup.diff 569
+SHA256 2e64be23e030ed0f08b243f0513800336d06739fc7e347a09c130958531b85cd files/a2ps-4.13c-psmandup.diff 569
+AUX a2ps-4.13c-stdarg.patch 1505 RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e SHA1 c215dae65c8e14fceaa31917e4a596800211c3e7 SHA256 9e7e630386b694b90b0bc6454bedc7c102d46b8bb6a6246eabd37e8b6d639c68
 MD5 2e24d355a977969b83fce03510ebd7b8 files/a2ps-4.13c-stdarg.patch 1505
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r2 133
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r3 133
-MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r4 491
+RMD160 5e46f07ec9d37ab53262f9611397f19bf3bd0b6e files/a2ps-4.13c-stdarg.patch 1505
+SHA256 9e7e630386b694b90b0bc6454bedc7c102d46b8bb6a6246eabd37e8b6d639c68 files/a2ps-4.13c-stdarg.patch 1505
+DIST a2ps-4.13c-ja_nls.patch.gz 38189 RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 SHA1 7eeb2c85697b5eff13701b7b600e4a959b12f134 SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f
+DIST a2ps-4.13c.tar.gz 2395885 RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 SHA1 f32f8476578a97049a5a75216ad6eda9f902dbc2 SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890
+EBUILD a2ps-4.13c-r2.ebuild 2052 RMD160 154dbe67337603459f6fa336757706b91b6d0582 SHA1 a699fd6a82e60d9fe073ab70b5fcc31e4a473a03 SHA256 b4421f680abea1dbaead755c6122e559cda546dee108a8ec4bc098ed10641d99
+MD5 58fd23bdb425dcdb8a969966f4cd8f01 a2ps-4.13c-r2.ebuild 2052
+RMD160 154dbe67337603459f6fa336757706b91b6d0582 a2ps-4.13c-r2.ebuild 2052
+SHA256 b4421f680abea1dbaead755c6122e559cda546dee108a8ec4bc098ed10641d99 a2ps-4.13c-r2.ebuild 2052
+EBUILD a2ps-4.13c-r3.ebuild 2120 RMD160 a671bfedc10ba89808e7db0aac2d81c2a8eee508 SHA1 6bd46bf452ac1adbc94a8978fcb3c862aafa6f3c SHA256 361782556ca83146752b3169158192ff472b44c966aceaadae85368e188c0d3c
+MD5 22fbebb3ab4461a9dc9ecb68e242fa07 a2ps-4.13c-r3.ebuild 2120
+RMD160 a671bfedc10ba89808e7db0aac2d81c2a8eee508 a2ps-4.13c-r3.ebuild 2120
+SHA256 361782556ca83146752b3169158192ff472b44c966aceaadae85368e188c0d3c a2ps-4.13c-r3.ebuild 2120
+EBUILD a2ps-4.13c-r4.ebuild 2298 RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a SHA1 b22c3cba9c33d6ea0f5930a38a0da9da74f2cb63 SHA256 074cd970c12781553f739d7e77a919dfc9e4c5e76ceabbff726ecca7b2b814b6
+MD5 acbfb7af08033b94a8c5577dfc0f7649 a2ps-4.13c-r4.ebuild 2298
+RMD160 a8fd568623a8b46ea0599dea23e09da145805e9a a2ps-4.13c-r4.ebuild 2298
+SHA256 074cd970c12781553f739d7e77a919dfc9e4c5e76ceabbff726ecca7b2b814b6 a2ps-4.13c-r4.ebuild 2298
+MISC ChangeLog 6972 RMD160 ba0259b5fc15d6cc4f583b68c414f39e86923f5a SHA1 25ea496686463844b2e283c402ac80e0a12fba64 SHA256 73aeaae21af1848836cf055de88951dd675fd46caaa9610f22eae9261b4c19c9
+MD5 f08eff4a0018be41880591b34dbb594b ChangeLog 6972
+RMD160 ba0259b5fc15d6cc4f583b68c414f39e86923f5a ChangeLog 6972
+SHA256 73aeaae21af1848836cf055de88951dd675fd46caaa9610f22eae9261b4c19c9 ChangeLog 6972
+MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
 MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
+RMD160 1823829273be97b95b286540a3439d152281baf1 metadata.xml 178
+SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a metadata.xml 178
+MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r2 491
+RMD160 c634cd7453cd6fda7c36b840d67f7b65bdd63565 files/digest-a2ps-4.13c-r2 491
+SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/digest-a2ps-4.13c-r2 491
+MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r3 491
+RMD160 c634cd7453cd6fda7c36b840d67f7b65bdd63565 files/digest-a2ps-4.13c-r3 491
+SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/digest-a2ps-4.13c-r3 491
+MD5 5cb08b483ff3e6161e5bb5a385bcc259 files/digest-a2ps-4.13c-r4 491
+RMD160 c634cd7453cd6fda7c36b840d67f7b65bdd63565 files/digest-a2ps-4.13c-r4 491
+SHA256 6a13642030ff00965e9055a33ca0b4169dc93d99d73a357b553031b076a16fc0 files/digest-a2ps-4.13c-r4 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEfK/zyZl4piiTjjYRAqs/AKDKDZYB/eXUPrpxCwVwCFIEwC8ZFQCeKmsd
+ru5foe9sbb/+ypxusUSc7Uk=
+=a4Ek
+-----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.13c-r4.ebuild b/app-text/a2ps/a2ps-4.13c-r4.ebuild
index a64ac9c9fa93..9cbc043ab81f 100644
--- a/app-text/a2ps/a2ps-4.13c-r4.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r4.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-r4.ebuild,v 1.2 2006/02/17 01:41:30 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r4.ebuild,v 1.3 2006/05/30 20:50:04 yvasilev Exp $
 
 inherit gnuconfig eutils
 
@@ -43,6 +43,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fixps.patch
 	epatch ${FILESDIR}/${P}-psmandup.diff
 
+	# fix fnmatch replacement, bug #134546
+	epatch ${FILESDIR}/${P}-fnmatch-replacement.patch
+
 	# fix sandbox violation, bug #79012
 	sed -i -e 's:$acroread -helpall:acroread4 -helpall:' configure configure.in
 
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
new file mode 100644
index 000000000000..c49ab78c93c0
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
@@ -0,0 +1,43 @@
+diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+--- a2ps-4.13.orig/lib/fnmatch.c	2002-03-04 12:46:25 -0600
++++ a2ps-4.13/lib/fnmatch.c	2006-05-27 11:41:15 -0500
+@@ -27,18 +27,6 @@
+ #include <fnmatch.h>
+ #include <ctype.h>
+ 
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+-   actually compiling the library itself.  This code is part of the GNU C
+-   Library, but also included in many other GNU distributions.  Compiling
+-   and linking in this code is a waste when using the GNU C library
+-   (especially if it is a shared library).  Rather than having every GNU
+-   program understand `configure --with-gnu-libc' and omit the object files,
+-   it is simpler to just do this in the source for each such file.  */
+-
+-#if defined _LIBC || !defined __GNU_LIBRARY__
+-
+-
+ # if defined STDC_HEADERS || !defined isascii
+ #  define ISASCII(c) 1
+ # else
+@@ -52,10 +40,13 @@
+ extern int errno;
+ # endif
+ 
++/* fnmatch replacement taken from the GNU C Library for systems that 
++   provide a broken implementation. */
++
+ /* Match STRING against the filename pattern PATTERN, returning zero if
+    it matches, nonzero if not.  */
+ int
+-fnmatch (const char *pattern, const char *string, int flags)
++rpl_fnmatch (const char *pattern, const char *string, int flags)
+ {
+   register const char *p = pattern, *n = string;
+   register char c;
+@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
+ 
+ # undef FOLD
+ }
+-
+-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r2 b/app-text/a2ps/files/digest-a2ps-4.13c-r2
index 4abfd89450cb..0cf5230e7350 100644
--- a/app-text/a2ps/files/digest-a2ps-4.13c-r2
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r2
@@ -1,2 +1,6 @@
-MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
 MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189
+RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 a2ps-4.13c-ja_nls.patch.gz 38189
+SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f a2ps-4.13c-ja_nls.patch.gz 38189
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
+RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 a2ps-4.13c.tar.gz 2395885
+SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890 a2ps-4.13c.tar.gz 2395885
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r3 b/app-text/a2ps/files/digest-a2ps-4.13c-r3
index 4abfd89450cb..0cf5230e7350 100644
--- a/app-text/a2ps/files/digest-a2ps-4.13c-r3
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r3
@@ -1,2 +1,6 @@
-MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
 MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189
+RMD160 932f430064f77d65768d2d1701ea650ae1103bb0 a2ps-4.13c-ja_nls.patch.gz 38189
+SHA256 8bc15ae152205b184a609777ac29430780eadacba2fd90bfa1fe318e43bd781f a2ps-4.13c-ja_nls.patch.gz 38189
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
+RMD160 d6464e88236a4efa8377e37e29e548411cd9c863 a2ps-4.13c.tar.gz 2395885
+SHA256 dfdd509ef79040fb300b2709a8fc54d9562f3ce141184958e3c2303cb3cf4890 a2ps-4.13c.tar.gz 2395885