Fixed a bug with USE="-nls", closing Bug #29732

4 files changed, 36 insertions, 5 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 8575a9f309fe..64694c3d1203 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,9 +1,13 @@
 # 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.15 2003/09/27 01:03:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.16 2003/09/27 15:02:40 usata Exp $
 
 *a2ps-4.13c (27 Sep 2003)
 
+  27 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13c.ebuild,
+  files/a2ps-4.13c-locale-gentoo.diff:
+  Fixed compilation failure when USE="-nls", closing Bug #29732
+
   27 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> a2ps-4.13c.ebuild:
   Version bumped(CVS snapshot).
 
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index d24bc438dc39..952e99b29cbb 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,10 +1,11 @@
-MD5 709d13d6a90fa29695ec831bbc319029 ChangeLog 2496
+MD5 59c669c1a7df18381702098aa9f8be57 ChangeLog 2668
 MD5 ace8354c5ef6feb07640ca561f18cda3 a2ps-4.13b-r4.ebuild 1162
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 a30a0f493f26cbb14aa50bb2a0203930 a2ps-4.13c.ebuild 1581
+MD5 a7baad380c849157d2bce0f292620bf9 a2ps-4.13c.ebuild 1625
 MD5 48020c7429c5da1c305db13c2640f3b9 a2ps-4.13b-r5.ebuild 1666
 MD5 4302a49fab6e10cdc21b8f275d8faa90 files/a2ps-4.13-autoconf-gentoo.diff 481
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 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.13c.ebuild b/app-text/a2ps/a2ps-4.13c.ebuild
index 1de3e7494d76..493db5ff0ada 100644
--- a/app-text/a2ps/a2ps-4.13c.ebuild
+++ b/app-text/a2ps/a2ps-4.13c.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.13c.ebuild,v 1.1 2003/09/27 01:03:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.2 2003/09/27 15:02:40 usata Exp $
 
 inherit gnuconfig eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~ia64 ~x86 ~ppc ~sparc -alpha"
 IUSE="nls tetex cjk"
 
 DEPEND=">=sys-devel/automake-1.6
@@ -34,6 +34,7 @@ src_unpack() {
 		gnuconfig_update || die "gnuconfig_update failed"
 	fi
 	cd ${S}
+	epatch ${FILESDIR}/${P}-locale-gentoo.diff
 	epatch ${FILESDIR}/a2ps-4.13-stdout.diff
 	use cjk && epatch ${DISTDIR}/${P}-ja_nls.patch.gz
 }
diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
new file mode 100644
index 000000000000..0b59956ebc05
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
@@ -0,0 +1,25 @@
+diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in
+--- a2ps-4.13.ORIG/config.h.in	2003-09-27 19:33:38.000000000 +0900
++++ a2ps-4.13/config.h.in	2003-09-27 21:25:46.000000000 +0900
+@@ -181,6 +181,9 @@
+ /* Define to 1 if you have the `rename' function. */
+ #undef HAVE_RENAME
+ 
++/* Define to 1 if you have the <locale.h> header file. */
++#undef HAVE_LOCALE_H
++
+ /* Define to 1 if you have the `setlocale' function. */
+ #undef HAVE_SETLOCALE
+ 
+diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
+--- a2ps-4.13.ORIG/configure.in	2003-09-27 19:33:38.000000000 +0900
++++ a2ps-4.13/configure.in	2003-09-27 21:26:05.000000000 +0900
+@@ -71,7 +71,7 @@
+ AC_HEADER_DIRENT
+ AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h  \
+  math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \
+- memory.h errno.h fcntl.h stdbool.h fnmatch.h)
++ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h)
+ 
+ ## --------------------- ##
+ ## Checks for typedefs.  ##