Apply patch for a locale related compile failure (bug #340008).

Package-Manager: portage-2.2.0_alpha22/cvs/Linux x86_64

4 files changed, 42 insertions, 14 deletions

diff --git a/app-text/xindy/ChangeLog b/app-text/xindy/ChangeLog
index b9914424ed07..418d46ace233 100644
--- a/app-text/xindy/ChangeLog
+++ b/app-text/xindy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xindy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/ChangeLog,v 1.11 2010/09/29 17:47:22 radhermit Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/ChangeLog,v 1.12 2011/02/09 09:02:34 radhermit Exp $
+
+  09 Feb 2011; Tim Harder <radhermit@gentoo.org> xindy-2.4.ebuild,
+  +files/xindy-2.4-locale.patch:
+  Apply patch for a locale related compile failure (bug #340008).
 
 *xindy-2.4 (29 Sep 2010)
 
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index d596230b6aa2..580e5571801f 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -3,20 +3,21 @@ Hash: SHA1
 
 AUX xindy-2.3-clisp-2.48.patch 926 RMD160 e69195dca913eb0575ece7de6b92845fda193f3d SHA1 9cb2bbfa7b3dbe2ed436b16effde30bcbe278ddb SHA256 52ef75a6e0c254e4c9943357b43aca677003a5aa852a3c6a1350456fced8dc48
 AUX xindy-2.4-configure.patch 884 RMD160 4be448be065635067930da43768d76615f3a34c4 SHA1 6216ef6fae2005a90e28e092bc1f285abdc5acec SHA256 8c65bc27d6f62898999ec22bf99096022df4b47d04b0d93550d2599837037725
+AUX xindy-2.4-locale.patch 679 RMD160 ab51445440efc510963b2bf598a85d2e1209a6d0 SHA1 2f31d09b631ac309a3ec6b4675d61ed295d8bf21 SHA256 654c301948d9d6764c4b444b343429203c7213d3064138925751f4032074d6bc
 DIST xindy-2.3.tar.gz 10695987 RMD160 ab9421f1f5ce8fe471839944fd42fddc26ac1a8f SHA1 9cbbc659f50a9791a30c8c98fa5c38b58e29527e SHA256 671cc69b3c02f1ee43250dfee117931b6dc33cc701e225819589787d2bf05071
 DIST xindy-2.4.tar.gz 498024 RMD160 a5d91e0cadb191ff5169a3e7c659d087d4660808 SHA1 5f49f4cea23efc293be9305b774e56356f9eb0d9 SHA256 616f977b014d67814d6ca45149e1452f3b1410176969d32b6ead5bdf6dc55d71
 EBUILD xindy-2.3.ebuild 1106 RMD160 6fb0208f44d06970dfe762e9457c3e18a4b8f233 SHA1 32d5dd20cf5d4919580b2088bb4bc40c36424b13 SHA256 bbe48b198be587d86b7cea8e234b6fe5aaa197d191f91e17ce49f2a84bf794ae
-EBUILD xindy-2.4.ebuild 973 RMD160 efc3706509a970a3e951bcc29376bddc16abeec8 SHA1 442e8dc3eacd6cce2f6d6a96f42a7401a1df156f SHA256 e721ee33bbddf194e2430c8d0ffab8a7e3bb44ace0ff37642e99ac427bcb12f3
-MISC ChangeLog 1842 RMD160 87d41319f99e8a23f0439dd4fa4951677e5426ed SHA1 54b307dc2d1ba67258e3362068e6bf0b36e3d673 SHA256 1fa5dfdda055cddc7e43528cb472c4505102fb42e6be454b8d1604296d78292e
+EBUILD xindy-2.4.ebuild 1013 RMD160 46b930ad863fe3f7015ded54d0074b1888cad9c4 SHA1 ef3cf2a192a87be3a945868c820475cbd28c1740 SHA256 e6ee625d683d87143c6b8fc4eab1b888024aa86fdd453e448474a2b13e120eee
+MISC ChangeLog 2009 RMD160 98123b33979a292bc3ed8e640e2566c8963a8bc4 SHA1 c7c6f20634a9519c3e2aa241d239505e368fc072 SHA256 f473e5757550b55bd7a9a592741d1abc8cdff9ba8c41c9cd24f8bae83534d49a
 MISC metadata.xml 922 RMD160 27f6f0108b293a73c241beae84eb9d783c5d6c2d SHA1 a698270b26bf5c30cc9616388ef49cfc52dded4c SHA256 c3bbfb04edd75f7fa8aae555c735d8006c6feb1802c5ec17d3f5fc742b9a0202
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMo3uzAAoJEEqz6FtPBkyjyQgIAKBMPEvUxagXJxWxfurZoRvy
-GQN9x2ap/+V3bAxSztyePxheQTmfNjzrGQagFrwC+vjIO0DZiXJshSDZg74tcjUr
-WSJumLeXguX1FQFbsE4hgXBKVqLN6XQaLapkN1f9rpllP2yPTIYzGFFVzJZb9mmZ
-LnhZBs/2akgdTFbODInP4VTI94uhlc4G+tNJZPrhGda8MQS+mnaqC2kKd7eBJ2LJ
-4qLoVnpsBxMGH107Q4ZkgHBS8RkbLki7iqYR2ja7b3+ZI/1N4Hn9X23D3GUWQ1SH
-N94MgrGROjhYWTof6apnr0oCu9Cf4deOW3UBbtGLeI00whX14bsBGeS4CoaojZ0=
-=Dqq6
+iQEcBAEBAgAGBQJNUlgzAAoJEEqz6FtPBkyjtYAIALVvVf8FLcxJGFifJ3Wfwmfh
+J4r2vuINPeHGSAFGeC0cRJjaDGWjdIS+qndeYmaAG0D2Al5D2j1xovkC8+LIbZoJ
+plPF3x+UgrRsIbnfUu8fNKIr7HJ4RIlb9eoAnWo855LAnUrdkk+jqOehhACKZUno
+PgOHARSK4bSveWBrzqednROQdQvZLe36Y58ANXyXp7dByrjE+jOCztO/VCq7hw91
+xeEQbFL66PB47dCv64fJgMCGo95l+lQOO8yDopeY4EU27jqran+6ttzN9DVn2xyC
+78VXp/UucEDqezk2wZv2t6c+8wYdvVFaaoWL5RN2jf7YBpLRRMKyKuuD3u5uHCw=
+=rAWD
 -----END PGP SIGNATURE-----
diff --git a/app-text/xindy/files/xindy-2.4-locale.patch b/app-text/xindy/files/xindy-2.4-locale.patch
new file mode 100644
index 000000000000..c2edccc4bef6
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-locale.patch
@@ -0,0 +1,22 @@
+--- xindy-2.4.orig/src/Makefile.am
++++ xindy-2.4/src/Makefile.am
+@@ -41,7 +41,7 @@
+ DEFAULTS   = defaults.xdy
+ DUMP_XINDY = dump-xindy.lsp
+ MEMFILE    = xindy.mem
+-CLISP      = @CLISP@ -q -E iso-8859-1
++CLISP      = @CLISP@ -q
+ 
+ xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
+ 	rm -f $(MEMFILE)
+--- xindy-2.4.orig/user-commands/xindy.in
++++ xindy-2.4/user-commands/xindy.in
+@@ -777,7 +777,7 @@
+ sub call_xindy ( $$ ) {
+     my ($mem_file, $xindy_exp) = @_;
+ 
+-    my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
++    my @command = ($clisp, '-M', $mem_file);
+     if ( $interactive ) {
+ 	print "Proposed xindy expression:\n\n$xindy_exp\n"  unless $quiet;
+     } else {
diff --git a/app-text/xindy/xindy-2.4.ebuild b/app-text/xindy/xindy-2.4.ebuild
index 0a1af51f2596..330b1f749666 100644
--- a/app-text/xindy/xindy-2.4.ebuild
+++ b/app-text/xindy/xindy-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/xindy-2.4.ebuild,v 1.1 2010/09/29 17:47:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/xindy-2.4.ebuild,v 1.2 2011/02/09 09:02:34 radhermit Exp $
 
 EAPI=3
 
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-locale.patch
 	eautoreconf
 }