Version bump.

(Portage version: 2.1.4_rc9)

4 files changed, 106 insertions, 1 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 7bbf501a1ac8..9e61c3dc777c 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.69 2007/10/16 14:10:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.70 2007/12/13 04:44:08 vapier Exp $
+
+*flex-2.5.34 (13 Dec 2007)
+
+  13 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/flex-2.5.34-isatty.patch, +flex-2.5.34.ebuild:
+  Version bump.
 
   16 Oct 2007; Christoph Mende <angelos@gentoo.org> flex-2.5.33-r3.ebuild:
   Stable on amd64 wrt bug #195255
diff --git a/sys-devel/flex/files/digest-flex-2.5.34 b/sys-devel/flex/files/digest-flex-2.5.34
new file mode 100644
index 000000000000..0fb545f0a885
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.34
@@ -0,0 +1,3 @@
+MD5 fbdabda79de417b863970eb03c0f53a3 flex-2.5.34.tar.bz2 1253930
+RMD160 1a86b48ee255911406eb328bd79e208f0922d027 flex-2.5.34.tar.bz2 1253930
+SHA256 1c8e64f32508841b0441ddfb139c4cfd25fee3728cadb63f5f351c6eb9b224a6 flex-2.5.34.tar.bz2 1253930
diff --git a/sys-devel/flex/files/flex-2.5.34-isatty.patch b/sys-devel/flex/files/flex-2.5.34-isatty.patch
new file mode 100644
index 000000000000..b397433c5c57
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.34-isatty.patch
@@ -0,0 +1,53 @@
+Declare the isatty prototype all the time ... otherwise packages like
+doxygen and ttmkfdir fail to build.
+
+http://bugs.gentoo.org/119598
+
+--- flex/scan.c
++++ flex/scan.c
+@@ -4179,9 +4179,19 @@
+ 	yyfree((void *) b  );
+ }
+ 
++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
+-#ifndef __cplusplus
++#ifdef __cplusplus
++extern "C" {
++#endif
++#ifdef __THROW /* this is a gnuism */
++extern int isatty (int ) __THROW;
++#else
+ extern int isatty (int );
++#endif
+-#endif /* __cplusplus */
++#ifdef __cplusplus
++}
++#endif
++#endif
+     
+ /* Initializes or reinitializes a buffer.
+  * This function is sometimes called more than once on the same buffer,
+--- flex/skel.c
++++ flex/skel.c
+@@ -2183,9 +2183,19 @@
+   "[[",
+   "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
+   "    [[",
++  "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
+-  "#ifndef __cplusplus",
++  "#ifdef __cplusplus",
++  "extern \"C\" {",
++  "#endif",
++  "#ifdef __THROW /* this is a gnuism */",
++  "extern int isatty M4_YY_PARAMS( int ) __THROW;",
++  "#else",
+   "extern int isatty M4_YY_PARAMS( int );",
++  "#endif",
+-  "#endif /* __cplusplus */",
++  "#ifdef __cplusplus",
++  "}",
++  "#endif",
++  "#endif",
+   "    ]])",
+   "]])",
+   "%endif",
diff --git a/sys-devel/flex/flex-2.5.34.ebuild b/sys-devel/flex/flex-2.5.34.ebuild
new file mode 100644
index 000000000000..be7e38bd0687
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.34.ebuild
@@ -0,0 +1,43 @@
+# 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.34.ebuild,v 1.1 2007/12/13 04:44:08 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"
+# Three regressions (according to test suite):
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849812&group_id=97492&atid=618177
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849809&group_id=97492&atid=618177
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849805&group_id=97492&atid=618177
+#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}"/${P}-isatty.patch #119598
+	epatch "${FILESDIR}"/${PN}-2.5.33-pic.patch
+}
+
+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
+}