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

(Portage version: 2.1.3_rc9)

4 files changed, 65 insertions, 1 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/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
+}