Modified a patch, closing #32163.

4 files changed, 27 insertions, 11 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 86f194905ea1..395bf920b80e 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.17 2003/09/28 21:15:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.18 2003/10/29 18:40:25 usata Exp $
 
 *a2ps-4.13c (27 Sep 2003)
 
@@ -16,6 +16,10 @@
 
 *a2ps-4.13b-r5 (16 Jul 2003)
 
+  30 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13b-r5.ebuild,
+  files/a2ps-4.13-autoconf-gentoo.diff:
+  Modified a patch to fix undefined macros
+
   27 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13b-r4.ebuild,
   a2ps-4.13b-r5.ebuild:
   Added gperf to DEPEND. Thanks to Shawn Leas <core@enodev.com> for
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 2baf4366627a..94ea74a4326e 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,11 +1,11 @@
-MD5 48020c7429c5da1c305db13c2640f3b9 a2ps-4.13b-r5.ebuild 1666
-MD5 9903e6e3352019ea6a18cc911ba208c2 a2ps-4.13c.ebuild 1665
+MD5 3cb7f7cd89272e774ad2c89a19359c3d ChangeLog 2955
 MD5 ace8354c5ef6feb07640ca561f18cda3 a2ps-4.13b-r4.ebuild 1162
-MD5 e1dc1baaa4cb65b66e0f7fc8524bba29 ChangeLog 2800
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 9903e6e3352019ea6a18cc911ba208c2 a2ps-4.13c.ebuild 1665
+MD5 150435eb2cf31e9dca6ce2cb3bbf7c32 a2ps-4.13b-r5.ebuild 1666
+MD5 5a704cab2b0467a558bbc2ef843c0b6e files/a2ps-4.13-autoconf-gentoo.diff 808
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
-MD5 4302a49fab6e10cdc21b8f275d8faa90 files/a2ps-4.13-autoconf-gentoo.diff 481
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c 133
-MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
 MD5 98bf324f9bbeef13a3a5f875d2f0198f files/digest-a2ps-4.13b-r4 63
 MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r5 130
+MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c 133
+MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
diff --git a/app-text/a2ps/a2ps-4.13b-r5.ebuild b/app-text/a2ps/a2ps-4.13b-r5.ebuild
index 666060dbca1a..ebcfa40edb6e 100644
--- a/app-text/a2ps/a2ps-4.13b-r5.ebuild
+++ b/app-text/a2ps/a2ps-4.13b-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.7 2003/09/26 20:40:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.8 2003/10/29 18:40:25 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -8,8 +8,8 @@ S=${WORKDIR}/${P/b/}
 DESCRIPTION="Any to PostScript filter"
 SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${P}.tar.gz
 	cjk? ( http://www.on.cs.keio.ac.jp/~yasu/linux/GNU/a2ps-4.13-ja_nls.patch ) "
-PATCHES="${FILESDIR}/a2ps-4.13-stdout.diff
-	${FILESDIR}/a2ps-4.13-autoconf-gentoo.diff"
+PATCHES="${FILESDIR}/a2ps-4.13-autoconf-gentoo.diff
+	${FILESDIR}/a2ps-4.13-stdout.diff"
 
 if use cjk; then
 	PATCHES="${PATCHES} ${DISTDIR}/a2ps-4.13-ja_nls.patch"
diff --git a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff b/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
index 96250379d3dc..02ab222b2f93 100644
--- a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
+++ b/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
@@ -1,4 +1,4 @@
-diff -urN a2ps-4.13.ORIG/ogonkify/configure.in a2ps-4.13/ogonkify/configure.in
+diff -urN a2ps-4.13.ORIG a2ps-4.13
 --- a2ps-4.13.ORIG/ogonkify/configure.in	2000-01-07 21:19:55.000000000 +0900
 +++ a2ps-4.13/ogonkify/configure.in	2003-09-16 06:33:29.000000000 +0900
 @@ -53,7 +53,7 @@
@@ -10,3 +10,15 @@ diff -urN a2ps-4.13.ORIG/ogonkify/configure.in a2ps-4.13/ogonkify/configure.in
  AC_OUTPUT(Makefile ogonkify.in
  	   doc/Makefile
  	   m4/Makefile)
+diff -urN a2ps-4.13.ORIG a2ps-4.13
+--- a2ps-4.13.ORIG/configure.in	2000-01-07 21:19:55.000000000 +0900
++++ a2ps-4.13/configure.in	2003-09-16 06:33:29.000000000 +0900
+@@ -82,7 +82,7 @@
+ AC_TYPE_PID_T
+ AC_TYPE_SIGNAL
+ AC_STRUCT_TM
+-AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
++dnl AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
+ [#if HAVE_PWD_H
+ # include <pwd.h>
+ #endif])