Add fix from upstream for locale setting #186092 by Evgeniy Dushistov.

Package-Manager: portage-2.1.3_rc9

5 files changed, 90 insertions, 5 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 659457f26640..9b89f8fd3ac7 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.60 2007/06/27 06:11:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.61 2007/07/30 10:10:27 vapier Exp $
+
+*flex-2.5.33-r3 (30 Jul 2007)
+
+  30 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/flex-2.5.33-setlocale.patch, +flex-2.5.33-r3.ebuild:
+  Add fix from upstream for locale setting #186092 by Evgeniy Dushistov.
 
   27 Jun 2007; Markus Rothe <corsair@gentoo.org> flex-2.5.33-r2.ebuild:
   Stable on ppc64; bug #183256
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 5b1d2dca4694..02fdd60b12bf 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX flex-2.5.31-check-for-locale-header.patch 1011 RMD160 5812d387e982f8a00ddb5a82c5d53a968fb3d682 SHA1 b6c4adde5f325b118e7fb59135e452cfd594be6c SHA256 67196ce234c5edabd0652f0888ab58503e6f8e10a023fa72f894ca19be7deab7
 MD5 2f1f506c1cba186162e0d8a21fbb93d1 files/flex-2.5.31-check-for-locale-header.patch 1011
 RMD160 5812d387e982f8a00ddb5a82c5d53a968fb3d682 files/flex-2.5.31-check-for-locale-header.patch 1011
@@ -22,6 +25,10 @@ AUX flex-2.5.33-pic.patch 531 RMD160 b76f8e0e95350bf2ea44466b1eafe27b2721a693 SH
 MD5 7593f717a7a633c29e00081cbe91f4f9 files/flex-2.5.33-pic.patch 531
 RMD160 b76f8e0e95350bf2ea44466b1eafe27b2721a693 files/flex-2.5.33-pic.patch 531
 SHA256 c37bc0a3da23cd523a115971dfdda08b524107e4a67ef507887b0c4eb9fd565e files/flex-2.5.33-pic.patch 531
+AUX flex-2.5.33-setlocale.patch 330 RMD160 a6795135ed618eef666cc75208f5d4d7176dc66e SHA1 80819d19d5bd2420b4d9fba76c83773c4cc21cf3 SHA256 c5df07c06847cae32927c59dacd77642db2be4b6bb0aced738003e2ce2cc5f6b
+MD5 dd5a86d3bc101e27e1eb8c3d277ca83c files/flex-2.5.33-setlocale.patch 330
+RMD160 a6795135ed618eef666cc75208f5d4d7176dc66e files/flex-2.5.33-setlocale.patch 330
+SHA256 c5df07c06847cae32927c59dacd77642db2be4b6bb0aced738003e2ce2cc5f6b files/flex-2.5.33-setlocale.patch 330
 AUX flex-2.5.4-glibc22.patch 2241 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da SHA1 e42a9ae22ca57efc8ecc719cd4ecacb6a7e3ee3f SHA256 787c733eb4e4d4272930a43fbf13b045c6ed2b363a3066e42eed38bc3c5b0941
 MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da files/flex-2.5.4-glibc22.patch 2241
@@ -53,14 +60,18 @@ EBUILD flex-2.5.33-r2.ebuild 1168 RMD160 0cd33ea90c900a0b6b473f0ffb35f73e9689d24
 MD5 a06f6e373f1a9395ce03195b8d338689 flex-2.5.33-r2.ebuild 1168
 RMD160 0cd33ea90c900a0b6b473f0ffb35f73e9689d24d flex-2.5.33-r2.ebuild 1168
 SHA256 cd2a66b1333ef43966502e1da6c195b5786250a038eab2c1fcc53fb7bc2836e9 flex-2.5.33-r2.ebuild 1168
+EBUILD flex-2.5.33-r3.ebuild 1210 RMD160 47261a1e8f57737dc146739b3c1420d2dfc8ed71 SHA1 1e28cba52a05d4ef1b5add249372363905aba146 SHA256 71aaad7cfe58e48610b13e41eeabc470f88a9d18b255703f20986c620fd68812
+MD5 84589b30843706b545e07bb0db698d63 flex-2.5.33-r3.ebuild 1210
+RMD160 47261a1e8f57737dc146739b3c1420d2dfc8ed71 flex-2.5.33-r3.ebuild 1210
+SHA256 71aaad7cfe58e48610b13e41eeabc470f88a9d18b255703f20986c620fd68812 flex-2.5.33-r3.ebuild 1210
 EBUILD flex-2.5.4a-r6.ebuild 1503 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 SHA1 a995e0af8b13cf73a303157998ed4ac8a62a966a SHA256 3a5bdc146e8965503d8adc65ed235a8d4a1384da17d2bad85ce0df3e3372bc55
 MD5 db3a332edb8736f7ab472366015aebf3 flex-2.5.4a-r6.ebuild 1503
 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 flex-2.5.4a-r6.ebuild 1503
 SHA256 3a5bdc146e8965503d8adc65ed235a8d4a1384da17d2bad85ce0df3e3372bc55 flex-2.5.4a-r6.ebuild 1503
-MISC ChangeLog 5883 RMD160 7e53b4bfb84a8665cde2905fd66cdc54d4456435 SHA1 e84fe39e2acded5a529ba8b8126cba0900c2aa7e SHA256 342e43f5c005a5139ddd021d04af3bbf169604f312cebfb0572e486927dfda4c
-MD5 361f6ea36854d7a577409f8b6e3e3733 ChangeLog 5883
-RMD160 7e53b4bfb84a8665cde2905fd66cdc54d4456435 ChangeLog 5883
-SHA256 342e43f5c005a5139ddd021d04af3bbf169604f312cebfb0572e486927dfda4c ChangeLog 5883
+MISC ChangeLog 6099 RMD160 3a3f5c37bb52c95e78a4c71c8a37d746b0ec119c SHA1 540ba8975b457527980e387390d9eba2face6d48 SHA256 bb4d3ef745982610d294940b920a974c498aeec4c62119e2078a226e3d17c19b
+MD5 41b0d0b110c35ffe35e6e3063b359cf0 ChangeLog 6099
+RMD160 3a3f5c37bb52c95e78a4c71c8a37d746b0ec119c ChangeLog 6099
+SHA256 bb4d3ef745982610d294940b920a974c498aeec4c62119e2078a226e3d17c19b ChangeLog 6099
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -71,6 +82,16 @@ SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/di
 MD5 e68b10187d8bdca8df57ac846f303f60 files/digest-flex-2.5.33-r2 238
 RMD160 94aecec05781807a73dfd57470b2945b702e821e files/digest-flex-2.5.33-r2 238
 SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/digest-flex-2.5.33-r2 238
+MD5 e68b10187d8bdca8df57ac846f303f60 files/digest-flex-2.5.33-r3 238
+RMD160 94aecec05781807a73dfd57470b2945b702e821e files/digest-flex-2.5.33-r3 238
+SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/digest-flex-2.5.33-r3 238
 MD5 788d22236c14474298d9855a3f4e07b1 files/digest-flex-2.5.4a-r6 503
 RMD160 5046cb32171af73ef02d2a2672ce86e5cbd01659 files/digest-flex-2.5.4a-r6 503
 SHA256 0747f6d3edfddecae7e8463a4186e61ba1c025c09babaab95c074d13ba46b698 files/digest-flex-2.5.4a-r6 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGrbkap/wUKkr7RBoRAm7OAJ9XUNUkHfO0GaL1FDkiiypnCq5BJQCgn46O
+KmZJUxq6sTCC2FnhxlHXLp8=
+=2bku
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/digest-flex-2.5.33-r3 b/sys-devel/flex/files/digest-flex-2.5.33-r3
new file mode 100644
index 000000000000..7a65ac6d8d99
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.33-r3
@@ -0,0 +1,3 @@
+MD5 343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 695464
+RMD160 360e08457d324c5b87c02b0ed61983877c173c98 flex-2.5.33.tar.bz2 695464
+SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914 flex-2.5.33.tar.bz2 695464
diff --git a/sys-devel/flex/files/flex-2.5.33-setlocale.patch b/sys-devel/flex/files/flex-2.5.33-setlocale.patch
new file mode 100644
index 000000000000..fead8ed8e9b4
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.33-setlocale.patch
@@ -0,0 +1,14 @@
+fix from upstream cvs
+
+http://bugs.gentoo.org/186092
+
+--- flex/main.c	2006/10/22 22:17:38	2.131
++++ flex/main.c	2007/04/14 12:27:58	2.132
+@@ -213,6 +213,7 @@
+ #if ENABLE_NLS
+ #if HAVE_LOCALE_H
+ 	setlocale (LC_MESSAGES, "");
++        setlocale (LC_CTYPE, "");
+ 	textdomain (PACKAGE);
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ #endif
diff --git a/sys-devel/flex/flex-2.5.33-r3.ebuild b/sys-devel/flex/flex-2.5.33-r3.ebuild
new file mode 100644
index 000000000000..ae5e2478b6b6
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.33-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.33-r3.ebuild,v 1.1 2007/07/30 10:10:27 vapier Exp $
+
+inherit eutils flag-o-matic
+
+#DEB_VER=36
+DESCRIPTION="GNU lexical analyser generator"
+HOMEPAGE="http://flex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
+#	mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="nls static"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	epatch "${FILESDIR}"/${PN}-2.5.31-include.patch
+	epatch "${FILESDIR}"/${P}-isatty.patch #119598
+	epatch "${FILESDIR}"/${P}-pic.patch
+	epatch "${FILESDIR}"/${P}-setlocale.patch #186092
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
+	dosym flex /usr/bin/lex
+}