Fixed occasional breakage with nls support. bug #63919 refers.

4 files changed, 42 insertions, 8 deletions

diff --git a/dev-libs/libgpg-error/ChangeLog b/dev-libs/libgpg-error/ChangeLog
index b5a40d0b1375..a235332996f8 100644
--- a/dev-libs/libgpg-error/ChangeLog
+++ b/dev-libs/libgpg-error/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgpg-error
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.26 2004/10/19 08:29:08 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.27 2004/11/16 11:36:48 dragonheart Exp $
+
+  16 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/libgpg-error-1.0-locale.h.patch, libgpg-error-1.0-r1.ebuild:
+  Fixed occasional breakage with nls support. bug #63919 refers.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   libgpg-error-1.0-r1.ebuild:
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index f1a238dff1e0..46ba55abab3f 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,10 +1,21 @@
-MD5 c57d3cf87e31d977c51d70a74fbfe988 ChangeLog 3459
-MD5 b0153ae67ca19243de6c4daaaea36375 libgpg-error-1.0-r1.ebuild 839
-MD5 df9c078d300477cf17fb2a82b8993ce5 libgpg-error-1.0.ebuild 855
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ae58f213e6f829993d6ae1df5cca9f9 ChangeLog 3651
 MD5 cbb90c3fb885f86a1c6bea0f4493f9ab metadata.xml 250
+MD5 df9c078d300477cf17fb2a82b8993ce5 libgpg-error-1.0.ebuild 855
+MD5 78d9b8bf4c1c61094079e7efd1447439 libgpg-error-1.0-r1.ebuild 1086
 MD5 622d2ebe3ed3ca88a279470a57ff3f30 libgpg-error-0.6-r1.ebuild 706
 MD5 d4ffc587beba100c7ef2b962707941c6 libgpg-error-0.7-r1.ebuild 792
 MD5 79ccf482189a756d86e48ae6519bae82 files/digest-libgpg-error-0.7-r1 68
-MD5 302b903544cdc360228540b136ca4826 files/digest-libgpg-error-1.0 68
 MD5 2a0413caa56a5072d7da6e76fa995239 files/digest-libgpg-error-0.6-r1 68
+MD5 302b903544cdc360228540b136ca4826 files/digest-libgpg-error-1.0 68
 MD5 302b903544cdc360228540b136ca4826 files/digest-libgpg-error-1.0-r1 68
+MD5 351613fb76980248b69def1933899216 files/libgpg-error-1.0-locale.h.patch 367
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBmeZWmdTrptrqvGERAl8EAJ0c8eShSSPECh+I+rnAiAhOWPelOwCfeqiu
+SyjQ2HHl6Im0Mp6VS5JZXAM=
+=Wo67
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.0-locale.h.patch b/dev-libs/libgpg-error/files/libgpg-error-1.0-locale.h.patch
new file mode 100644
index 000000000000..a9af118cb33e
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.0-locale.h.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2004-11-16 20:34:14.350506736 +0930
++++ configure.ac	2004-11-16 20:34:38.026907376 +0930
+@@ -70,6 +70,7 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h])
++AC_CHECK_HEADERS([locale.h])
+ AC_FUNC_STRERROR_R
+ AC_CHECK_FUNC([strerror_r], [],
+   AC_MSG_WARN([[Without strerror_r, gpg_strerror_r might not be thread-safe]]))
diff --git a/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild
index 338c5fced3f0..55686980bf0f 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild,v 1.5 2004/11/10 03:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.0-r1.ebuild,v 1.6 2004/11/16 11:36:48 dragonheart Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="http://www.gnupg.org/(en)/download/index.html#libgpg-error"
@@ -13,11 +13,20 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ppc-macos s390 sparc ~x86"
 IUSE="nls"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!ppc-macos? ( >=sys-devel/autoconf-2.59 )"
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libgpg-error-1.0-locale.h.patch
+	if ! useq ppc-macos
+	then
+		env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
+		autoheader || die "autoheader failed"
+	fi
 	gnuconfig_update
 }