summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-04 20:37:47 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-04 20:37:47 +0000
commit2a87c31e228ad354ca6d6fe6c32e9ae7a690d4fa (patch)
tree9d3b12cf9704016199fb0e93b3edf55b90ebd7c3 /sys-devel/flex
parentStable for x86, wrt bug #428910 (diff)
downloadgentoo-2-2a87c31e228ad354ca6d6fe6c32e9ae7a690d4fa.tar.gz
gentoo-2-2a87c31e228ad354ca6d6fe6c32e9ae7a690d4fa.tar.bz2
gentoo-2-2a87c31e228ad354ca6d6fe6c32e9ae7a690d4fa.zip
Version bump #429774 by Samuli Suominen.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/flex')
-rw-r--r--sys-devel/flex/ChangeLog8
-rw-r--r--sys-devel/flex/files/flex-2.5.37-proto.patch27
-rw-r--r--sys-devel/flex/flex-2.5.37.ebuild49
3 files changed, 83 insertions, 1 deletions
diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index ced2bd41ce6d..4b6c32630530 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-devel/flex
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.97 2012/04/26 13:12:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.98 2012/08/04 20:37:47 vapier Exp $
+
+*flex-2.5.37 (04 Aug 2012)
+
+ 04 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/flex-2.5.37-proto.patch, +flex-2.5.37.ebuild:
+ Version bump #429774 by Samuli Suominen.
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> flex-2.5.35_p10.ebuild:
keyword ~amd64-fbsd
diff --git a/sys-devel/flex/files/flex-2.5.37-proto.patch b/sys-devel/flex/files/flex-2.5.37-proto.patch
new file mode 100644
index 000000000000..5d3c30ff18d2
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.37-proto.patch
@@ -0,0 +1,27 @@
+From 0f9eb0b8455f843daebf0f3dababeee7f3cde48b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 4 Aug 2012 15:46:38 -0400
+Subject: [PATCH] add prototype for lerrsf_fatal
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ flexdef.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/flexdef.h b/flexdef.h
+index 0e81410..046dd9a 100644
+--- a/flexdef.h
++++ b/flexdef.h
+@@ -908,6 +908,9 @@ extern void lerrif PROTO ((const char *, int));
+ /* Report an error message formatted with one string argument. */
+ extern void lerrsf PROTO ((const char *, const char *));
+
++/* Like lerrsf, but also exit after displaying message. */
++extern void lerrsf_fatal PROTO ((const char *, const char *));
++
+ /* Spit out a "#line" statement. */
+ extern void line_directive_out PROTO ((FILE *, int));
+
+--
+1.7.9.7
+
diff --git a/sys-devel/flex/flex-2.5.37.ebuild b/sys-devel/flex/flex-2.5.37.ebuild
new file mode 100644
index 000000000000..d8ea6df4d1d6
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.37.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.37.ebuild,v 1.1 2012/08/04 20:37:47 vapier Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} == *_p* ]] ; then
+ DEB_DIFF=${PN}_${PV/_p/-}
+fi
+MY_P=${P%_p*}
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="http://flex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flex/${MY_P}.tar.bz2
+ ${DEB_DIFF:+mirror://debian/pool/main/f/flex/${DEB_DIFF}.diff.gz}"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="nls static test"
+
+# We want bison explicitly and not yacc in general #381273
+RDEPEND="sys-devel/m4"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ test? ( sys-devel/bison )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ [[ -n ${DEB_DIFF} ]] && epatch "${WORKDIR}"/${DEB_DIFF}.diff
+ epatch "${FILESDIR}"/${P}-proto.patch
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ $(use_enable nls) \
+ --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ rm "${D}"/usr/share/doc/${PF}/{COPYING,flex.pdf} || die
+ dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
+ dosym flex /usr/bin/lex
+}